mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Don't use alloc_bootmem() in init_IRQ() path powerpc: Fix spin_event_timeout() to be robust over context switches powerpc: Use pr_devel() in do_dcache_icache_coherency() powerpc/cell: Use pr_devel() in axon_msi.c powerpc: Use pr_devel() in arch/powerpc/mm/gup.c powerpc: Cleanup & use pr_devel() in arch/powerpc/mm/slb.c powerpc/perf_counter: Remove duplicated #include powerpc: Use pr_devel() in arch/powerpc/mm/mmu_context_nohash.c powerpc/pseries: Use pr_devel() in xics.c powerpc: Remove unnecessary semicolons powerpc/pseries: Use pr_devel() in pseries LPAR HPTE routines powerpc/44x: Fix build error with -Werror for Warp platform powerpc/4xx: Have Warp take advantage of GPIO LEDs default-state = keep powerpc/44x: Update Warp defconfig
This commit is contained in:
commit
d6d4655172
25 changed files with 225 additions and 129 deletions
|
@ -261,10 +261,11 @@ power-leds {
|
|||
compatible = "gpio-leds";
|
||||
green {
|
||||
gpios = <&GPIO1 0 0>;
|
||||
default-state = "on";
|
||||
default-state = "keep";
|
||||
};
|
||||
red {
|
||||
gpios = <&GPIO1 1 0>;
|
||||
default-state = "keep";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.29-rc2
|
||||
# Fri Jan 23 07:57:16 2009
|
||||
# Linux kernel version: 2.6.30
|
||||
# Tue Jun 9 23:35:36 2009
|
||||
#
|
||||
# CONFIG_PPC64 is not set
|
||||
|
||||
|
@ -41,6 +41,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
|
|||
CONFIG_GENERIC_HWEIGHT=y
|
||||
CONFIG_GENERIC_CALIBRATE_DELAY=y
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
|
||||
CONFIG_PPC=y
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
|
@ -53,10 +54,12 @@ CONFIG_PPC_UDBG_16550=y
|
|||
# CONFIG_GENERIC_TBSYNC is not set
|
||||
CONFIG_AUDIT_ARCH=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_DTC=y
|
||||
# CONFIG_DEFAULT_UIMAGE is not set
|
||||
CONFIG_PPC_DCR_NATIVE=y
|
||||
# CONFIG_PPC_DCR_MMIO is not set
|
||||
CONFIG_PPC_DCR=y
|
||||
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
|
||||
#
|
||||
|
@ -74,7 +77,17 @@ CONFIG_SYSVIPC_SYSCTL=y
|
|||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
# CONFIG_TASKSTATS is not set
|
||||
# CONFIG_AUDIT is not set
|
||||
# CONFIG_IKCONFIG is not set
|
||||
|
||||
#
|
||||
# RCU Subsystem
|
||||
#
|
||||
CONFIG_CLASSIC_RCU=y
|
||||
# CONFIG_TREE_RCU is not set
|
||||
# CONFIG_PREEMPT_RCU is not set
|
||||
# CONFIG_TREE_RCU_TRACE is not set
|
||||
# CONFIG_PREEMPT_RCU_TRACE is not set
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_GROUP_SCHED=y
|
||||
CONFIG_FAIR_GROUP_SCHED=y
|
||||
|
@ -82,27 +95,29 @@ CONFIG_FAIR_GROUP_SCHED=y
|
|||
CONFIG_USER_SCHED=y
|
||||
# CONFIG_CGROUP_SCHED is not set
|
||||
# CONFIG_CGROUPS is not set
|
||||
CONFIG_SYSFS_DEPRECATED=y
|
||||
CONFIG_SYSFS_DEPRECATED_V2=y
|
||||
# CONFIG_SYSFS_DEPRECATED_V2 is not set
|
||||
# CONFIG_RELAY is not set
|
||||
# CONFIG_NAMESPACES is not set
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_RD_GZIP=y
|
||||
# CONFIG_RD_BZIP2 is not set
|
||||
# CONFIG_RD_LZMA is not set
|
||||
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
|
||||
CONFIG_SYSCTL=y
|
||||
CONFIG_ANON_INODES=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_STRIP_ASM_SYMS 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
|
||||
|
@ -110,10 +125,13 @@ CONFIG_EVENTFD=y
|
|||
CONFIG_SHMEM=y
|
||||
CONFIG_AIO=y
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_SLAB=y
|
||||
# CONFIG_SLUB is not set
|
||||
CONFIG_SLUB_DEBUG=y
|
||||
CONFIG_COMPAT_BRK=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_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
|
@ -121,6 +139,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
|
|||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_KRETPROBES=y
|
||||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
||||
# CONFIG_SLOW_WORK is not set
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
|
@ -133,7 +152,6 @@ CONFIG_MODULE_UNLOAD=y
|
|||
# CONFIG_MODULE_SRCVERSION_ALL is not set
|
||||
CONFIG_BLOCK=y
|
||||
# CONFIG_LBD is not set
|
||||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_BLK_DEV_BSG is not set
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
|
@ -149,11 +167,6 @@ CONFIG_DEFAULT_AS=y
|
|||
# CONFIG_DEFAULT_CFQ is not set
|
||||
# CONFIG_DEFAULT_NOOP is not set
|
||||
CONFIG_DEFAULT_IOSCHED="anticipatory"
|
||||
CONFIG_CLASSIC_RCU=y
|
||||
# CONFIG_TREE_RCU is not set
|
||||
# CONFIG_PREEMPT_RCU is not set
|
||||
# CONFIG_TREE_RCU_TRACE is not set
|
||||
# CONFIG_PREEMPT_RCU_TRACE is not set
|
||||
# CONFIG_FREEZER is not set
|
||||
|
||||
#
|
||||
|
@ -173,10 +186,11 @@ CONFIG_WARP=y
|
|||
# CONFIG_ARCHES is not set
|
||||
# CONFIG_CANYONLANDS is not set
|
||||
# CONFIG_GLACIER is not set
|
||||
# CONFIG_REDWOOD is not set
|
||||
# CONFIG_YOSEMITE is not set
|
||||
# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
|
||||
# CONFIG_PPC44x_SIMPLE is not set
|
||||
# CONFIG_PPC4xx_GPIO is not set
|
||||
CONFIG_PPC4xx_GPIO=y
|
||||
CONFIG_440EP=y
|
||||
CONFIG_IBM440EP_ERR42=y
|
||||
# CONFIG_IPIC is not set
|
||||
|
@ -235,9 +249,13 @@ CONFIG_ZONE_DMA_FLAG=1
|
|||
CONFIG_BOUNCE=y
|
||||
CONFIG_VIRT_TO_BUS=y
|
||||
CONFIG_UNEVICTABLE_LRU=y
|
||||
CONFIG_HAVE_MLOCK=y
|
||||
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
|
||||
CONFIG_STDBINUTILS=y
|
||||
CONFIG_PPC_4K_PAGES=y
|
||||
# CONFIG_PPC_16K_PAGES is not set
|
||||
# CONFIG_PPC_64K_PAGES is not set
|
||||
# CONFIG_PPC_256K_PAGES is not set
|
||||
CONFIG_FORCE_MAX_ZONEORDER=11
|
||||
CONFIG_PROC_DEVICETREE=y
|
||||
CONFIG_CMDLINE_BOOL=y
|
||||
|
@ -256,6 +274,7 @@ CONFIG_PPC_PCI_CHOICE=y
|
|||
# CONFIG_PCI_DOMAINS is not set
|
||||
# CONFIG_PCI_SYSCALL is not set
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
# CONFIG_HAS_RAPIDIO is not set
|
||||
|
||||
#
|
||||
|
@ -271,14 +290,12 @@ CONFIG_PAGE_OFFSET=0xc0000000
|
|||
CONFIG_KERNEL_START=0xc0000000
|
||||
CONFIG_PHYSICAL_START=0x00000000
|
||||
CONFIG_TASK_SIZE=0xc0000000
|
||||
CONFIG_CONSISTENT_START=0xff100000
|
||||
CONFIG_CONSISTENT_SIZE=0x00200000
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
# Networking options
|
||||
#
|
||||
CONFIG_COMPAT_NET_DEV_OPS=y
|
||||
CONFIG_PACKET=y
|
||||
# CONFIG_PACKET_MMAP is not set
|
||||
CONFIG_UNIX=y
|
||||
|
@ -353,6 +370,7 @@ CONFIG_VLAN_8021Q=y
|
|||
# CONFIG_LAPB is not set
|
||||
# CONFIG_ECONET is not set
|
||||
# CONFIG_WAN_ROUTER is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_NET_SCHED is not set
|
||||
# CONFIG_DCB is not set
|
||||
|
||||
|
@ -365,7 +383,6 @@ CONFIG_VLAN_8021Q=y
|
|||
# CONFIG_IRDA is not set
|
||||
# CONFIG_BT is not set
|
||||
# CONFIG_AF_RXRPC is not set
|
||||
# CONFIG_PHONET is not set
|
||||
# CONFIG_WIRELESS is not set
|
||||
# CONFIG_WIMAX is not set
|
||||
# CONFIG_RFKILL is not set
|
||||
|
@ -378,8 +395,12 @@ CONFIG_VLAN_8021Q=y
|
|||
#
|
||||
# Generic Driver Options
|
||||
#
|
||||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
# CONFIG_STANDALONE is not set
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_DEBUG_DRIVER is not set
|
||||
# CONFIG_DEBUG_DEVRES is not set
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
|
@ -471,13 +492,21 @@ CONFIG_MTD_NAND_NDFC=y
|
|||
# LPDDR flash memory drivers
|
||||
#
|
||||
# CONFIG_MTD_LPDDR is not set
|
||||
# CONFIG_MTD_QINFO_PROBE is not set
|
||||
|
||||
#
|
||||
# UBI - Unsorted block images
|
||||
#
|
||||
# CONFIG_MTD_UBI is not set
|
||||
CONFIG_MTD_UBI=y
|
||||
CONFIG_MTD_UBI_WL_THRESHOLD=4096
|
||||
CONFIG_MTD_UBI_BEB_RESERVE=1
|
||||
# CONFIG_MTD_UBI_GLUEBI is not set
|
||||
|
||||
#
|
||||
# UBI debugging options
|
||||
#
|
||||
# CONFIG_MTD_UBI_DEBUG is not set
|
||||
CONFIG_OF_DEVICE=y
|
||||
CONFIG_OF_GPIO=y
|
||||
CONFIG_OF_I2C=y
|
||||
# CONFIG_PARPORT is not set
|
||||
CONFIG_BLK_DEV=y
|
||||
|
@ -495,10 +524,17 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
|
|||
# CONFIG_XILINX_SYSACE is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ICS932S401 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
# CONFIG_ISL29003 is not set
|
||||
# CONFIG_C2PORT is not set
|
||||
|
||||
#
|
||||
# EEPROM support
|
||||
#
|
||||
CONFIG_EEPROM_AT24=y
|
||||
# CONFIG_EEPROM_LEGACY is not set
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
CONFIG_HAVE_IDE=y
|
||||
# CONFIG_IDE is not set
|
||||
|
||||
|
@ -529,7 +565,7 @@ CONFIG_BLK_DEV_SD=y
|
|||
# CONFIG_SCSI_CONSTANTS is not set
|
||||
# CONFIG_SCSI_LOGGING is not set
|
||||
# CONFIG_SCSI_SCAN_ASYNC is not set
|
||||
CONFIG_SCSI_WAIT_SCAN=m
|
||||
# CONFIG_SCSI_WAIT_SCAN is not set
|
||||
|
||||
#
|
||||
# SCSI Transports
|
||||
|
@ -541,10 +577,12 @@ CONFIG_SCSI_SPI_ATTRS=y
|
|||
# CONFIG_SCSI_SRP_ATTRS is not set
|
||||
# CONFIG_SCSI_LOWLEVEL is not set
|
||||
# CONFIG_SCSI_DH is not set
|
||||
# CONFIG_SCSI_OSD_INITIATOR is not set
|
||||
# CONFIG_ATA is not set
|
||||
# CONFIG_MD is not set
|
||||
# CONFIG_MACINTOSH_DRIVERS is not set
|
||||
CONFIG_NETDEVICES=y
|
||||
CONFIG_COMPAT_NET_DEV_OPS=y
|
||||
# CONFIG_DUMMY is not set
|
||||
# CONFIG_BONDING is not set
|
||||
# CONFIG_MACVLAN is not set
|
||||
|
@ -554,6 +592,8 @@ CONFIG_NETDEVICES=y
|
|||
# CONFIG_PHYLIB is not set
|
||||
CONFIG_NET_ETHERNET=y
|
||||
CONFIG_MII=y
|
||||
# CONFIG_ETHOC is not set
|
||||
# CONFIG_DNET is not set
|
||||
CONFIG_IBM_NEW_EMAC=y
|
||||
CONFIG_IBM_NEW_EMAC_RXB=128
|
||||
CONFIG_IBM_NEW_EMAC_TXB=64
|
||||
|
@ -577,7 +617,6 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
|
|||
#
|
||||
# CONFIG_WLAN_PRE80211 is not set
|
||||
# CONFIG_WLAN_80211 is not set
|
||||
# CONFIG_IWLWIFI_LEDS is not set
|
||||
|
||||
#
|
||||
# Enable WiMAX (Networking options) to see the WiMAX drivers
|
||||
|
@ -646,6 +685,7 @@ CONFIG_LEGACY_PTY_COUNT=256
|
|||
# CONFIG_HVC_UDBG is not set
|
||||
# CONFIG_IPMI_HANDLER is not set
|
||||
CONFIG_HW_RANDOM=y
|
||||
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
|
||||
# CONFIG_NVRAM is not set
|
||||
# CONFIG_GEN_RTC is not set
|
||||
# CONFIG_R3964 is not set
|
||||
|
@ -663,6 +703,7 @@ CONFIG_I2C_HELPER_AUTO=y
|
|||
#
|
||||
# I2C system bus drivers (mostly embedded / system-on-chip)
|
||||
#
|
||||
# CONFIG_I2C_GPIO is not set
|
||||
CONFIG_I2C_IBM_IIC=y
|
||||
# CONFIG_I2C_MPC is not set
|
||||
# CONFIG_I2C_OCORES is not set
|
||||
|
@ -685,12 +726,9 @@ CONFIG_I2C_IBM_IIC=y
|
|||
# Miscellaneous I2C Chip support
|
||||
#
|
||||
# CONFIG_DS1682 is not set
|
||||
CONFIG_EEPROM_AT24=y
|
||||
CONFIG_EEPROM_LEGACY=y
|
||||
# CONFIG_SENSORS_PCF8574 is not set
|
||||
# CONFIG_PCF8575 is not set
|
||||
# CONFIG_SENSORS_PCA9539 is not set
|
||||
# CONFIG_SENSORS_PCF8591 is not set
|
||||
# CONFIG_SENSORS_MAX6875 is not set
|
||||
# CONFIG_SENSORS_TSL2550 is not set
|
||||
# CONFIG_I2C_DEBUG_CORE is not set
|
||||
|
@ -699,7 +737,30 @@ CONFIG_EEPROM_LEGACY=y
|
|||
# CONFIG_I2C_DEBUG_CHIP is not set
|
||||
# CONFIG_SPI is not set
|
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
||||
# CONFIG_GPIOLIB is not set
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
CONFIG_GPIOLIB=y
|
||||
# CONFIG_DEBUG_GPIO is not set
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
|
||||
#
|
||||
# Memory mapped GPIO expanders:
|
||||
#
|
||||
# CONFIG_GPIO_XILINX is not set
|
||||
|
||||
#
|
||||
# I2C GPIO expanders:
|
||||
#
|
||||
# CONFIG_GPIO_MAX732X is not set
|
||||
# CONFIG_GPIO_PCA953X is not set
|
||||
# CONFIG_GPIO_PCF857X is not set
|
||||
|
||||
#
|
||||
# PCI GPIO expanders:
|
||||
#
|
||||
|
||||
#
|
||||
# SPI GPIO expanders:
|
||||
#
|
||||
# CONFIG_W1 is not set
|
||||
# CONFIG_POWER_SUPPLY is not set
|
||||
CONFIG_HWMON=y
|
||||
|
@ -721,6 +782,7 @@ CONFIG_SENSORS_AD7414=y
|
|||
# CONFIG_SENSORS_F71805F is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
# CONFIG_SENSORS_F75375S is not set
|
||||
# CONFIG_SENSORS_G760A is not set
|
||||
# CONFIG_SENSORS_GL518SM is not set
|
||||
# CONFIG_SENSORS_GL520SM is not set
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
|
@ -735,11 +797,15 @@ CONFIG_SENSORS_AD7414=y
|
|||
# CONFIG_SENSORS_LM90 is not set
|
||||
# CONFIG_SENSORS_LM92 is not set
|
||||
# CONFIG_SENSORS_LM93 is not set
|
||||
# CONFIG_SENSORS_LTC4215 is not set
|
||||
# CONFIG_SENSORS_LTC4245 is not set
|
||||
# CONFIG_SENSORS_LM95241 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_PCF8591 is not set
|
||||
# CONFIG_SENSORS_SHT15 is not set
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
# CONFIG_SENSORS_SMSC47M1 is not set
|
||||
# CONFIG_SENSORS_SMSC47M192 is not set
|
||||
|
@ -785,6 +851,7 @@ CONFIG_SSB_POSSIBLE=y
|
|||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_TPS65010 is not set
|
||||
# CONFIG_TWL4030_CORE is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
# CONFIG_PMIC_DA903X is not set
|
||||
|
@ -870,11 +937,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
|
|||
# CONFIG_USB_TMC is not set
|
||||
|
||||
#
|
||||
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
|
||||
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
|
||||
#
|
||||
|
||||
#
|
||||
# see USB_STORAGE Help for more information
|
||||
# also be needed; see USB_STORAGE Help for more info
|
||||
#
|
||||
CONFIG_USB_STORAGE=y
|
||||
# CONFIG_USB_STORAGE_DEBUG is not set
|
||||
|
@ -915,7 +982,6 @@ CONFIG_USB_STORAGE=y
|
|||
# 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
|
||||
|
@ -929,6 +995,8 @@ CONFIG_USB_STORAGE=y
|
|||
#
|
||||
# OTG and related infrastructure
|
||||
#
|
||||
# CONFIG_USB_GPIO_VBUS is not set
|
||||
# CONFIG_NOP_USB_XCEIV is not set
|
||||
CONFIG_MMC=y
|
||||
# CONFIG_MMC_DEBUG is not set
|
||||
# CONFIG_MMC_UNSAFE_RESUME is not set
|
||||
|
@ -946,6 +1014,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
|
|||
#
|
||||
# CONFIG_MMC_SDHCI is not set
|
||||
# CONFIG_MMC_WBSD is not set
|
||||
CONFIG_MMC_PIKASD=y
|
||||
# CONFIG_MEMSTICK is not set
|
||||
CONFIG_NEW_LEDS=y
|
||||
CONFIG_LEDS_CLASS=y
|
||||
|
@ -953,16 +1022,31 @@ CONFIG_LEDS_CLASS=y
|
|||
#
|
||||
# LED drivers
|
||||
#
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEDS_GPIO_PLATFORM is not set
|
||||
CONFIG_LEDS_GPIO_OF=y
|
||||
# CONFIG_LEDS_LP5521 is not set
|
||||
# CONFIG_LEDS_PCA955X is not set
|
||||
# CONFIG_LEDS_BD2802 is not set
|
||||
|
||||
#
|
||||
# LED Triggers
|
||||
#
|
||||
# CONFIG_LEDS_TRIGGERS is not set
|
||||
CONFIG_LEDS_TRIGGERS=y
|
||||
# CONFIG_LEDS_TRIGGER_TIMER is not set
|
||||
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||
# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
|
||||
# CONFIG_LEDS_TRIGGER_GPIO is not set
|
||||
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
||||
|
||||
#
|
||||
# iptables trigger is under Netfilter config (LED target)
|
||||
#
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_EDAC is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_AUXDISPLAY is not set
|
||||
# CONFIG_UIO is not set
|
||||
# CONFIG_STAGING is not set
|
||||
|
||||
|
@ -973,6 +1057,7 @@ CONFIG_EXT2_FS=y
|
|||
# CONFIG_EXT2_FS_XATTR is not set
|
||||
# CONFIG_EXT2_FS_XIP is not set
|
||||
CONFIG_EXT3_FS=y
|
||||
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
|
||||
# CONFIG_EXT3_FS_XATTR is not set
|
||||
# CONFIG_EXT4_FS is not set
|
||||
CONFIG_JBD=y
|
||||
|
@ -992,6 +1077,11 @@ CONFIG_INOTIFY_USER=y
|
|||
# CONFIG_AUTOFS4_FS is not set
|
||||
# CONFIG_FUSE_FS is not set
|
||||
|
||||
#
|
||||
# Caches
|
||||
#
|
||||
# CONFIG_FSCACHE is not set
|
||||
|
||||
#
|
||||
# CD-ROM/DVD Filesystems
|
||||
#
|
||||
|
@ -1039,6 +1129,12 @@ CONFIG_JFFS2_ZLIB=y
|
|||
# CONFIG_JFFS2_LZO is not set
|
||||
CONFIG_JFFS2_RTIME=y
|
||||
# CONFIG_JFFS2_RUBIN is not set
|
||||
CONFIG_UBIFS_FS=y
|
||||
# CONFIG_UBIFS_FS_XATTR is not set
|
||||
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
|
||||
CONFIG_UBIFS_FS_LZO=y
|
||||
CONFIG_UBIFS_FS_ZLIB=y
|
||||
# CONFIG_UBIFS_FS_DEBUG is not set
|
||||
CONFIG_CRAMFS=y
|
||||
# CONFIG_SQUASHFS is not set
|
||||
# CONFIG_VXFS_FS is not set
|
||||
|
@ -1049,6 +1145,7 @@ CONFIG_CRAMFS=y
|
|||
# CONFIG_ROMFS_FS is not set
|
||||
# CONFIG_SYSV_FS is not set
|
||||
# CONFIG_UFS_FS is not set
|
||||
# CONFIG_NILFS2_FS is not set
|
||||
CONFIG_NETWORK_FILESYSTEMS=y
|
||||
CONFIG_NFS_FS=y
|
||||
CONFIG_NFS_V3=y
|
||||
|
@ -1060,7 +1157,6 @@ CONFIG_LOCKD=y
|
|||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
# CONFIG_SUNRPC_REGISTER_V4 is not set
|
||||
# CONFIG_RPCSEC_GSS_KRB5 is not set
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
# CONFIG_SMB_FS is not set
|
||||
|
@ -1115,6 +1211,7 @@ CONFIG_NLS_ISO8859_15=y
|
|||
# CONFIG_NLS_KOI8_U is not set
|
||||
CONFIG_NLS_UTF8=y
|
||||
# CONFIG_DLM is not set
|
||||
# CONFIG_BINARY_PRINTF is not set
|
||||
|
||||
#
|
||||
# Library routines
|
||||
|
@ -1122,7 +1219,7 @@ CONFIG_NLS_UTF8=y
|
|||
CONFIG_BITREVERSE=y
|
||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
||||
CONFIG_CRC_CCITT=y
|
||||
# CONFIG_CRC16 is not set
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRC_T10DIF=y
|
||||
# CONFIG_CRC_ITU_T is not set
|
||||
CONFIG_CRC32=y
|
||||
|
@ -1130,16 +1227,19 @@ CONFIG_CRC32=y
|
|||
# CONFIG_LIBCRC32C is not set
|
||||
CONFIG_ZLIB_INFLATE=y
|
||||
CONFIG_ZLIB_DEFLATE=y
|
||||
CONFIG_PLIST=y
|
||||
CONFIG_LZO_COMPRESS=y
|
||||
CONFIG_LZO_DECOMPRESS=y
|
||||
CONFIG_DECOMPRESS_GZIP=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAVE_LMB=y
|
||||
CONFIG_NLATTR=y
|
||||
|
||||
#
|
||||
# Kernel hacking
|
||||
#
|
||||
# CONFIG_PRINTK_TIME is not set
|
||||
CONFIG_PRINTK_TIME=y
|
||||
CONFIG_ENABLE_WARN_DEPRECATED=y
|
||||
CONFIG_ENABLE_MUST_CHECK=y
|
||||
CONFIG_FRAME_WARN=1024
|
||||
|
@ -1152,11 +1252,15 @@ CONFIG_DEBUG_KERNEL=y
|
|||
CONFIG_DETECT_SOFTLOCKUP=y
|
||||
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
|
||||
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
|
||||
CONFIG_DETECT_HUNG_TASK=y
|
||||
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
|
||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
|
||||
# CONFIG_SCHED_DEBUG is not set
|
||||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_TIMER_STATS is not set
|
||||
# CONFIG_DEBUG_OBJECTS is not set
|
||||
# CONFIG_DEBUG_SLAB 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
|
||||
|
@ -1180,9 +1284,12 @@ CONFIG_DEBUG_INFO=y
|
|||
# CONFIG_FAULT_INJECTION is not set
|
||||
# CONFIG_LATENCYTOP is not set
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_TRACING_SUPPORT=y
|
||||
|
||||
#
|
||||
# Tracers
|
||||
|
@ -1190,24 +1297,27 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
|||
# CONFIG_FUNCTION_TRACER is not set
|
||||
# CONFIG_SCHED_TRACER is not set
|
||||
# CONFIG_CONTEXT_SWITCH_TRACER is not set
|
||||
# CONFIG_EVENT_TRACER is not set
|
||||
# CONFIG_BOOT_TRACER is not set
|
||||
# CONFIG_TRACE_BRANCH_PROFILING is not set
|
||||
# CONFIG_STACK_TRACER is not set
|
||||
# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
|
||||
# CONFIG_KMEMTRACE is not set
|
||||
# CONFIG_WORKQUEUE_TRACER is not set
|
||||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_DYNAMIC_DEBUG is not set
|
||||
# CONFIG_SAMPLES is not set
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
# CONFIG_KGDB is not set
|
||||
CONFIG_PRINT_STACK_DEPTH=64
|
||||
# CONFIG_DEBUG_STACKOVERFLOW is not set
|
||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_CODE_PATCHING_SELFTEST is not set
|
||||
# CONFIG_FTR_FIXUP_SELFTEST is not set
|
||||
# CONFIG_MSI_BITMAP_SELFTEST is not set
|
||||
# CONFIG_XMON is not set
|
||||
CONFIG_IRQSTACKS=y
|
||||
# CONFIG_VIRQ_DEBUG is not set
|
||||
CONFIG_BDI_SWITCH=y
|
||||
# CONFIG_BDI_SWITCH is not set
|
||||
# CONFIG_PPC_EARLY_DEBUG is not set
|
||||
|
||||
#
|
||||
|
@ -1223,6 +1333,8 @@ CONFIG_CRYPTO=y
|
|||
# Crypto core or helper
|
||||
#
|
||||
# CONFIG_CRYPTO_FIPS is not set
|
||||
CONFIG_CRYPTO_ALGAPI=y
|
||||
CONFIG_CRYPTO_ALGAPI2=y
|
||||
# CONFIG_CRYPTO_MANAGER is not set
|
||||
# CONFIG_CRYPTO_MANAGER2 is not set
|
||||
# CONFIG_CRYPTO_GF128MUL is not set
|
||||
|
@ -1294,13 +1406,15 @@ CONFIG_CRYPTO=y
|
|||
#
|
||||
# Compression
|
||||
#
|
||||
# CONFIG_CRYPTO_DEFLATE is not set
|
||||
# CONFIG_CRYPTO_LZO is not set
|
||||
CONFIG_CRYPTO_DEFLATE=y
|
||||
# CONFIG_CRYPTO_ZLIB is not set
|
||||
CONFIG_CRYPTO_LZO=y
|
||||
|
||||
#
|
||||
# Random Number Generation
|
||||
#
|
||||
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
||||
CONFIG_CRYPTO_HW=y
|
||||
# CONFIG_CRYPTO_DEV_PPC4XX is not set
|
||||
# CONFIG_PPC_CLOCK is not set
|
||||
# CONFIG_VIRTUALIZATION is not set
|
||||
|
|
|
@ -63,6 +63,8 @@ extern void udelay(unsigned long usecs);
|
|||
udelay(delay); \
|
||||
else \
|
||||
cpu_relax(); \
|
||||
if (!__ret) \
|
||||
__ret = (condition); \
|
||||
__ret; \
|
||||
})
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
*/
|
||||
#include <linux/string.h>
|
||||
#include <linux/perf_counter.h>
|
||||
#include <linux/string.h>
|
||||
#include <asm/reg.h>
|
||||
#include <asm/cputable.h>
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
*/
|
||||
#include <linux/string.h>
|
||||
#include <linux/perf_counter.h>
|
||||
#include <linux/string.h>
|
||||
#include <asm/reg.h>
|
||||
#include <asm/cputable.h>
|
||||
|
||||
|
|
|
@ -159,7 +159,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
|
|||
int psize;
|
||||
#endif
|
||||
|
||||
pr_debug("%s(%lx,%x,%s)\n", __func__, start, nr_pages, write ? "write" : "read");
|
||||
pr_devel("%s(%lx,%x,%s)\n", __func__, start, nr_pages, write ? "write" : "read");
|
||||
|
||||
start &= PAGE_MASK;
|
||||
addr = start;
|
||||
|
@ -170,7 +170,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
|
|||
start, len)))
|
||||
goto slow_irqon;
|
||||
|
||||
pr_debug(" aligned: %lx .. %lx\n", start, end);
|
||||
pr_devel(" aligned: %lx .. %lx\n", start, end);
|
||||
|
||||
#ifdef CONFIG_HUGETLB_PAGE
|
||||
/* We bail out on slice boundary crossing when hugetlb is
|
||||
|
@ -234,7 +234,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
|
|||
do {
|
||||
VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, a)].shift);
|
||||
ptep = huge_pte_offset(mm, a);
|
||||
pr_debug(" %016lx: huge ptep %p\n", a, ptep);
|
||||
pr_devel(" %016lx: huge ptep %p\n", a, ptep);
|
||||
if (!ptep || !gup_huge_pte(ptep, hstate, &a, end, write, pages,
|
||||
&nr))
|
||||
goto slow;
|
||||
|
@ -249,7 +249,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
|
|||
#ifdef CONFIG_PPC64
|
||||
VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, addr)].shift);
|
||||
#endif
|
||||
pr_debug(" %016lx: normal pgd %p\n", addr,
|
||||
pr_devel(" %016lx: normal pgd %p\n", addr,
|
||||
(void *)pgd_val(pgd));
|
||||
next = pgd_addr_end(addr, end);
|
||||
if (pgd_none(pgd))
|
||||
|
@ -269,7 +269,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
|
|||
slow:
|
||||
local_irq_enable();
|
||||
slow_irqon:
|
||||
pr_debug(" slow path ! nr = %d\n", nr);
|
||||
pr_devel(" slow path ! nr = %d\n", nr);
|
||||
|
||||
/* Try to get the remaining pages with get_user_pages */
|
||||
start += nr << PAGE_SHIFT;
|
||||
|
|
|
@ -89,7 +89,7 @@ static unsigned int steal_context_smp(unsigned int id)
|
|||
id = first_context;
|
||||
continue;
|
||||
}
|
||||
pr_debug("[%d] steal context %d from mm @%p\n",
|
||||
pr_devel("[%d] steal context %d from mm @%p\n",
|
||||
smp_processor_id(), id, mm);
|
||||
|
||||
/* Mark this mm has having no context anymore */
|
||||
|
@ -126,7 +126,7 @@ static unsigned int steal_context_up(unsigned int id)
|
|||
/* Pick up the victim mm */
|
||||
mm = context_mm[id];
|
||||
|
||||
pr_debug("[%d] steal context %d from mm @%p\n", cpu, id, mm);
|
||||
pr_devel("[%d] steal context %d from mm @%p\n", cpu, id, mm);
|
||||
|
||||
/* Flush the TLB for that context */
|
||||
local_flush_tlb_mm(mm);
|
||||
|
@ -180,7 +180,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
|
|||
spin_lock(&context_lock);
|
||||
|
||||
#ifndef DEBUG_STEAL_ONLY
|
||||
pr_debug("[%d] activating context for mm @%p, active=%d, id=%d\n",
|
||||
pr_devel("[%d] activating context for mm @%p, active=%d, id=%d\n",
|
||||
cpu, next, next->context.active, next->context.id);
|
||||
#endif
|
||||
|
||||
|
@ -189,7 +189,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
|
|||
next->context.active++;
|
||||
if (prev) {
|
||||
#ifndef DEBUG_STEAL_ONLY
|
||||
pr_debug(" old context %p active was: %d\n",
|
||||
pr_devel(" old context %p active was: %d\n",
|
||||
prev, prev->context.active);
|
||||
#endif
|
||||
WARN_ON(prev->context.active < 1);
|
||||
|
@ -236,7 +236,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
|
|||
next->context.id = id;
|
||||
|
||||
#ifndef DEBUG_STEAL_ONLY
|
||||
pr_debug("[%d] picked up new id %d, nrf is now %d\n",
|
||||
pr_devel("[%d] picked up new id %d, nrf is now %d\n",
|
||||
cpu, id, nr_free_contexts);
|
||||
#endif
|
||||
|
||||
|
@ -247,7 +247,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next)
|
|||
* local TLB for it and unmark it before we use it
|
||||
*/
|
||||
if (test_bit(id, stale_map[cpu])) {
|
||||
pr_debug("[%d] flushing stale context %d for mm @%p !\n",
|
||||
pr_devel("[%d] flushing stale context %d for mm @%p !\n",
|
||||
cpu, id, next);
|
||||
local_flush_tlb_mm(next);
|
||||
|
||||
|
@ -314,13 +314,13 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
|
|||
switch (action) {
|
||||
case CPU_ONLINE:
|
||||
case CPU_ONLINE_FROZEN:
|
||||
pr_debug("MMU: Allocating stale context map for CPU %d\n", cpu);
|
||||
pr_devel("MMU: Allocating stale context map for CPU %d\n", cpu);
|
||||
stale_map[cpu] = kzalloc(CTX_MAP_SIZE, GFP_KERNEL);
|
||||
break;
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
case CPU_DEAD:
|
||||
case CPU_DEAD_FROZEN:
|
||||
pr_debug("MMU: Freeing stale context map for CPU %d\n", cpu);
|
||||
pr_devel("MMU: Freeing stale context map for CPU %d\n", cpu);
|
||||
kfree(stale_map[cpu]);
|
||||
stale_map[cpu] = NULL;
|
||||
break;
|
||||
|
|
|
@ -129,12 +129,12 @@ static pte_t do_dcache_icache_coherency(pte_t pte)
|
|||
page = pfn_to_page(pfn);
|
||||
|
||||
if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags)) {
|
||||
pr_debug("do_dcache_icache_coherency... flushing\n");
|
||||
pr_devel("do_dcache_icache_coherency... flushing\n");
|
||||
flush_dcache_icache_page(page);
|
||||
set_bit(PG_arch_1, &page->flags);
|
||||
}
|
||||
else
|
||||
pr_debug("do_dcache_icache_coherency... already clean\n");
|
||||
pr_devel("do_dcache_icache_coherency... already clean\n");
|
||||
return __pte(pte_val(pte) | _PAGE_HWEXEC);
|
||||
}
|
||||
|
||||
|
|
|
@ -14,8 +14,6 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#undef DEBUG
|
||||
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/mmu.h>
|
||||
#include <asm/mmu_context.h>
|
||||
|
@ -27,11 +25,6 @@
|
|||
#include <linux/compiler.h>
|
||||
#include <asm/udbg.h>
|
||||
|
||||
#ifdef DEBUG
|
||||
#define DBG(fmt...) printk(fmt)
|
||||
#else
|
||||
#define DBG pr_debug
|
||||
#endif
|
||||
|
||||
extern void slb_allocate_realmode(unsigned long ea);
|
||||
extern void slb_allocate_user(unsigned long ea);
|
||||
|
@ -285,13 +278,13 @@ void slb_initialize(void)
|
|||
patch_slb_encoding(slb_compare_rr_to_size,
|
||||
mmu_slb_size);
|
||||
|
||||
DBG("SLB: linear LLP = %04lx\n", linear_llp);
|
||||
DBG("SLB: io LLP = %04lx\n", io_llp);
|
||||
pr_devel("SLB: linear LLP = %04lx\n", linear_llp);
|
||||
pr_devel("SLB: io LLP = %04lx\n", io_llp);
|
||||
|
||||
#ifdef CONFIG_SPARSEMEM_VMEMMAP
|
||||
patch_slb_encoding(slb_miss_kernel_load_vmemmap,
|
||||
SLB_VSID_KERNEL | vmemmap_llp);
|
||||
DBG("SLB: vmemmap LLP = %04lx\n", vmemmap_llp);
|
||||
pr_devel("SLB: vmemmap LLP = %04lx\n", vmemmap_llp);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,
|
|||
*/
|
||||
if (huge) {
|
||||
#ifdef CONFIG_HUGETLB_PAGE
|
||||
psize = get_slice_psize(mm, addr);;
|
||||
psize = get_slice_psize(mm, addr);
|
||||
#else
|
||||
BUG();
|
||||
psize = pte_pagesize_index(mm, addr, pte); /* shutup gcc */
|
||||
|
|
|
@ -185,7 +185,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
|
|||
goto fail;
|
||||
|
||||
if (shdr_str.sh_type != SHT_STRTAB)
|
||||
goto fail;;
|
||||
goto fail;
|
||||
|
||||
for (j = 0; j < shdr.sh_size / sizeof (sym); j++) {
|
||||
if (copy_from_user(&sym, spu_elf_start +
|
||||
|
|
|
@ -64,8 +64,6 @@ define_machine(warp) {
|
|||
};
|
||||
|
||||
|
||||
static u32 post_info;
|
||||
|
||||
static int __init warp_post_info(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
|
@ -87,10 +85,9 @@ static int __init warp_post_info(void)
|
|||
|
||||
iounmap(fpga);
|
||||
|
||||
if (post1 || post2) {
|
||||
if (post1 || post2)
|
||||
printk(KERN_INFO "Warp POST %08x %08x\n", post1, post2);
|
||||
post_info = 1;
|
||||
} else
|
||||
else
|
||||
printk(KERN_INFO "Warp POST OK\n");
|
||||
|
||||
return 0;
|
||||
|
@ -166,6 +163,9 @@ static irqreturn_t temp_isr(int irq, void *context)
|
|||
value ^= 1;
|
||||
mdelay(500);
|
||||
}
|
||||
|
||||
/* Not reached */
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int pika_setup_leds(void)
|
||||
|
@ -179,15 +179,10 @@ static int pika_setup_leds(void)
|
|||
}
|
||||
|
||||
for_each_child_of_node(np, child)
|
||||
if (strcmp(child->name, "green") == 0) {
|
||||
if (strcmp(child->name, "green") == 0)
|
||||
green_led = of_get_gpio(child, 0);
|
||||
/* Turn back on the green LED */
|
||||
gpio_set_value(green_led, 1);
|
||||
} else if (strcmp(child->name, "red") == 0) {
|
||||
else if (strcmp(child->name, "red") == 0)
|
||||
red_led = of_get_gpio(child, 0);
|
||||
/* Set based on post */
|
||||
gpio_set_value(red_led, post_info);
|
||||
}
|
||||
|
||||
of_node_put(np);
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ int __init pq2ads_pci_init_irq(void)
|
|||
goto out;
|
||||
}
|
||||
|
||||
priv = alloc_bootmem(sizeof(struct pq2ads_pci_pic));
|
||||
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
||||
if (!priv) {
|
||||
of_node_put(np);
|
||||
ret = -ENOMEM;
|
||||
|
|
|
@ -85,7 +85,7 @@ static inline void axon_msi_debug_setup(struct device_node *dn,
|
|||
|
||||
static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
|
||||
{
|
||||
pr_debug("axon_msi: dcr_write(0x%x, 0x%x)\n", val, dcr_n);
|
||||
pr_devel("axon_msi: dcr_write(0x%x, 0x%x)\n", val, dcr_n);
|
||||
|
||||
dcr_write(msic->dcr_host, dcr_n, val);
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
|
|||
int retry = 0;
|
||||
|
||||
write_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG);
|
||||
pr_debug("axon_msi: original write_offset 0x%x\n", write_offset);
|
||||
pr_devel("axon_msi: original write_offset 0x%x\n", write_offset);
|
||||
|
||||
/* write_offset doesn't wrap properly, so we have to mask it */
|
||||
write_offset &= MSIC_FIFO_SIZE_MASK;
|
||||
|
@ -108,7 +108,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
|
|||
msi = le32_to_cpu(msic->fifo_virt[idx]);
|
||||
msi &= 0xFFFF;
|
||||
|
||||
pr_debug("axon_msi: woff %x roff %x msi %x\n",
|
||||
pr_devel("axon_msi: woff %x roff %x msi %x\n",
|
||||
write_offset, msic->read_offset, msi);
|
||||
|
||||
if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) {
|
||||
|
@ -123,12 +123,12 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
|
|||
*/
|
||||
udelay(1);
|
||||
retry++;
|
||||
pr_debug("axon_msi: invalid irq 0x%x!\n", msi);
|
||||
pr_devel("axon_msi: invalid irq 0x%x!\n", msi);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (retry) {
|
||||
pr_debug("axon_msi: late irq 0x%x, retry %d\n",
|
||||
pr_devel("axon_msi: late irq 0x%x, retry %d\n",
|
||||
msi, retry);
|
||||
retry = 0;
|
||||
}
|
||||
|
@ -332,7 +332,7 @@ static int axon_msi_shutdown(struct of_device *device)
|
|||
struct axon_msic *msic = dev_get_drvdata(&device->dev);
|
||||
u32 tmp;
|
||||
|
||||
pr_debug("axon_msi: disabling %s\n",
|
||||
pr_devel("axon_msi: disabling %s\n",
|
||||
msic->irq_host->of_node->full_name);
|
||||
tmp = dcr_read(msic->dcr_host, MSIC_CTRL_REG);
|
||||
tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;
|
||||
|
@ -349,7 +349,7 @@ static int axon_msi_probe(struct of_device *device,
|
|||
unsigned int virq;
|
||||
int dcr_base, dcr_len;
|
||||
|
||||
pr_debug("axon_msi: setting up dn %s\n", dn->full_name);
|
||||
pr_devel("axon_msi: setting up dn %s\n", dn->full_name);
|
||||
|
||||
msic = kzalloc(sizeof(struct axon_msic), GFP_KERNEL);
|
||||
if (!msic) {
|
||||
|
@ -403,7 +403,7 @@ static int axon_msi_probe(struct of_device *device,
|
|||
|
||||
set_irq_data(virq, msic);
|
||||
set_irq_chained_handler(virq, axon_msi_cascade);
|
||||
pr_debug("axon_msi: irq 0x%x setup for axon_msi\n", virq);
|
||||
pr_devel("axon_msi: irq 0x%x setup for axon_msi\n", virq);
|
||||
|
||||
/* Enable the MSIC hardware */
|
||||
msic_dcr_write(msic, MSIC_BASE_ADDR_HI_REG, msic->fifo_phys >> 32);
|
||||
|
@ -484,13 +484,13 @@ void axon_msi_debug_setup(struct device_node *dn, struct axon_msic *msic)
|
|||
|
||||
addr = of_translate_address(dn, of_get_property(dn, "reg", NULL));
|
||||
if (addr == OF_BAD_ADDR) {
|
||||
pr_debug("axon_msi: couldn't translate reg property\n");
|
||||
pr_devel("axon_msi: couldn't translate reg property\n");
|
||||
return;
|
||||
}
|
||||
|
||||
msic->trigger = ioremap(addr, 0x4);
|
||||
if (!msic->trigger) {
|
||||
pr_debug("axon_msi: ioremap failed\n");
|
||||
pr_devel("axon_msi: ioremap failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -498,7 +498,7 @@ void axon_msi_debug_setup(struct device_node *dn, struct axon_msic *msic)
|
|||
|
||||
if (!debugfs_create_file(name, 0600, powerpc_debugfs_root,
|
||||
msic, &fops_msic)) {
|
||||
pr_debug("axon_msi: debugfs_create_file failed!\n");
|
||||
pr_devel("axon_msi: debugfs_create_file failed!\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -251,7 +251,7 @@ static void g5_pfunc_switch_volt(int speed_mode)
|
|||
static struct pmf_function *pfunc_cpu_setfreq_high;
|
||||
static struct pmf_function *pfunc_cpu_setfreq_low;
|
||||
static struct pmf_function *pfunc_cpu_getfreq;
|
||||
static struct pmf_function *pfunc_slewing_done;;
|
||||
static struct pmf_function *pfunc_slewing_done;
|
||||
|
||||
static int g5_pfunc_switch_freq(int speed_mode)
|
||||
{
|
||||
|
|
|
@ -609,7 +609,7 @@ static int pmacpic_find_viaint(void)
|
|||
np = of_find_node_by_name(NULL, "via-pmu");
|
||||
if (np == NULL)
|
||||
goto not_found;
|
||||
viaint = irq_of_parse_and_map(np, 0);;
|
||||
viaint = irq_of_parse_and_map(np, 0);
|
||||
|
||||
not_found:
|
||||
#endif /* CONFIG_ADB_PMU */
|
||||
|
|
|
@ -284,7 +284,6 @@ static int ps3_sb_free_mmio_region(struct ps3_mmio_region *r)
|
|||
int result;
|
||||
|
||||
dump_mmio_region(r);
|
||||
;
|
||||
result = lv1_unmap_device_mmio_region(r->dev->bus_id, r->dev->dev_id,
|
||||
r->lpar_addr);
|
||||
|
||||
|
|
|
@ -286,7 +286,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
|
|||
unsigned long hpte_v, hpte_r;
|
||||
|
||||
if (!(vflags & HPTE_V_BOLTED))
|
||||
pr_debug("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
|
||||
pr_devel("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
|
||||
"rflags=%lx, vflags=%lx, psize=%d)\n",
|
||||
hpte_group, va, pa, rflags, vflags, psize);
|
||||
|
||||
|
@ -294,7 +294,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
|
|||
hpte_r = hpte_encode_r(pa, psize) | rflags;
|
||||
|
||||
if (!(vflags & HPTE_V_BOLTED))
|
||||
pr_debug(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
|
||||
pr_devel(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
|
||||
|
||||
/* Now fill in the actual HPTE */
|
||||
/* Set CEC cookie to 0 */
|
||||
|
@ -311,7 +311,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
|
|||
lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);
|
||||
if (unlikely(lpar_rc == H_PTEG_FULL)) {
|
||||
if (!(vflags & HPTE_V_BOLTED))
|
||||
pr_debug(" full\n");
|
||||
pr_devel(" full\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -322,11 +322,11 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
|
|||
*/
|
||||
if (unlikely(lpar_rc != H_SUCCESS)) {
|
||||
if (!(vflags & HPTE_V_BOLTED))
|
||||
pr_debug(" lpar err %lu\n", lpar_rc);
|
||||
pr_devel(" lpar err %lu\n", lpar_rc);
|
||||
return -2;
|
||||
}
|
||||
if (!(vflags & HPTE_V_BOLTED))
|
||||
pr_debug(" -> slot: %lu\n", slot & 7);
|
||||
pr_devel(" -> slot: %lu\n", slot & 7);
|
||||
|
||||
/* Because of iSeries, we have to pass down the secondary
|
||||
* bucket bit here as well
|
||||
|
@ -418,17 +418,17 @@ static long pSeries_lpar_hpte_updatepp(unsigned long slot,
|
|||
|
||||
want_v = hpte_encode_avpn(va, psize, ssize);
|
||||
|
||||
pr_debug(" update: avpnv=%016lx, hash=%016lx, f=%lx, psize: %d ...",
|
||||
pr_devel(" update: avpnv=%016lx, hash=%016lx, f=%lx, psize: %d ...",
|
||||
want_v, slot, flags, psize);
|
||||
|
||||
lpar_rc = plpar_pte_protect(flags, slot, want_v);
|
||||
|
||||
if (lpar_rc == H_NOT_FOUND) {
|
||||
pr_debug("not found !\n");
|
||||
pr_devel("not found !\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
pr_debug("ok\n");
|
||||
pr_devel("ok\n");
|
||||
|
||||
BUG_ON(lpar_rc != H_SUCCESS);
|
||||
|
||||
|
@ -503,7 +503,7 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
|
|||
unsigned long lpar_rc;
|
||||
unsigned long dummy1, dummy2;
|
||||
|
||||
pr_debug(" inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
|
||||
pr_devel(" inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
|
||||
slot, va, psize, local);
|
||||
|
||||
want_v = hpte_encode_avpn(va, psize, ssize);
|
||||
|
|
|
@ -190,10 +190,10 @@ static void xics_unmask_irq(unsigned int virq)
|
|||
int call_status;
|
||||
int server;
|
||||
|
||||
pr_debug("xics: unmask virq %d\n", virq);
|
||||
pr_devel("xics: unmask virq %d\n", virq);
|
||||
|
||||
irq = (unsigned int)irq_map[virq].hwirq;
|
||||
pr_debug(" -> map to hwirq 0x%x\n", irq);
|
||||
pr_devel(" -> map to hwirq 0x%x\n", irq);
|
||||
if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
|
||||
return;
|
||||
|
||||
|
@ -252,7 +252,7 @@ static void xics_mask_irq(unsigned int virq)
|
|||
{
|
||||
unsigned int irq;
|
||||
|
||||
pr_debug("xics: mask virq %d\n", virq);
|
||||
pr_devel("xics: mask virq %d\n", virq);
|
||||
|
||||
irq = (unsigned int)irq_map[virq].hwirq;
|
||||
if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
|
||||
|
@ -414,7 +414,7 @@ static int xics_host_match(struct irq_host *h, struct device_node *node)
|
|||
static int xics_host_map(struct irq_host *h, unsigned int virq,
|
||||
irq_hw_number_t hw)
|
||||
{
|
||||
pr_debug("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
|
||||
pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
|
||||
|
||||
/* Insert the interrupt mapping into the radix tree for fast lookup */
|
||||
irq_radix_revmap_insert(xics_host, virq, hw);
|
||||
|
|
|
@ -965,7 +965,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr)
|
|||
break;
|
||||
default:
|
||||
str = "Unknown";
|
||||
break;;
|
||||
break;
|
||||
}
|
||||
dev_info(dev, "Hardware port width: %s\n", str);
|
||||
|
||||
|
|
|
@ -728,12 +728,10 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
|
|||
if (ret)
|
||||
return NULL;
|
||||
|
||||
ipic = alloc_bootmem(sizeof(struct ipic));
|
||||
ipic = kzalloc(sizeof(*ipic), GFP_KERNEL);
|
||||
if (ipic == NULL)
|
||||
return NULL;
|
||||
|
||||
memset(ipic, 0, sizeof(struct ipic));
|
||||
|
||||
ipic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
|
||||
NR_IPIC_INTS,
|
||||
&ipic_host_ops, 0);
|
||||
|
|
|
@ -508,9 +508,8 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)
|
|||
printk(KERN_INFO "mpic: Setting up HT PICs workarounds for U3/U4\n");
|
||||
|
||||
/* Allocate fixups array */
|
||||
mpic->fixups = alloc_bootmem(128 * sizeof(struct mpic_irq_fixup));
|
||||
mpic->fixups = kzalloc(128 * sizeof(*mpic->fixups), GFP_KERNEL);
|
||||
BUG_ON(mpic->fixups == NULL);
|
||||
memset(mpic->fixups, 0, 128 * sizeof(struct mpic_irq_fixup));
|
||||
|
||||
/* Init spinlock */
|
||||
spin_lock_init(&mpic->fixup_lock);
|
||||
|
@ -1109,9 +1108,8 @@ struct mpic * __init mpic_alloc(struct device_node *node,
|
|||
psize /= 4;
|
||||
bits = intvec_top + 1;
|
||||
mapsize = BITS_TO_LONGS(bits) * sizeof(unsigned long);
|
||||
mpic->protected = alloc_bootmem(mapsize);
|
||||
mpic->protected = kzalloc(mapsize, GFP_KERNEL);
|
||||
BUG_ON(mpic->protected == NULL);
|
||||
memset(mpic->protected, 0, mapsize);
|
||||
for (i = 0; i < psize; i++) {
|
||||
if (psrc[i] > intvec_top)
|
||||
continue;
|
||||
|
@ -1353,7 +1351,8 @@ void __init mpic_init(struct mpic *mpic)
|
|||
|
||||
#ifdef CONFIG_PM
|
||||
/* allocate memory to save mpic state */
|
||||
mpic->save_data = alloc_bootmem(mpic->num_sources * sizeof(struct mpic_irq_save));
|
||||
mpic->save_data = kmalloc(mpic->num_sources * sizeof(*mpic->save_data),
|
||||
GFP_KERNEL);
|
||||
BUG_ON(mpic->save_data == NULL);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -1531,7 +1531,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
|
|||
*/
|
||||
|
||||
/* Calculate window size */
|
||||
sa = (0xffffffffffffffffull << ilog2(ep_size));;
|
||||
sa = (0xffffffffffffffffull << ilog2(ep_size));
|
||||
|
||||
/* Setup BAR0 */
|
||||
out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));
|
||||
|
@ -1550,7 +1550,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
|
|||
out_le32(mbase + PCI_BASE_ADDRESS_1, RES_TO_U32_HIGH(ep_addr));
|
||||
} else {
|
||||
/* Calculate window size */
|
||||
sa = (0xffffffffffffffffull << ilog2(size));;
|
||||
sa = (0xffffffffffffffffull << ilog2(size));
|
||||
if (res->flags & IORESOURCE_PREFETCH)
|
||||
sa |= 0x8;
|
||||
|
||||
|
|
|
@ -333,12 +333,10 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags,
|
|||
if (ret)
|
||||
return;
|
||||
|
||||
qe_ic = alloc_bootmem(sizeof(struct qe_ic));
|
||||
qe_ic = kzalloc(sizeof(*qe_ic), GFP_KERNEL);
|
||||
if (qe_ic == NULL)
|
||||
return;
|
||||
|
||||
memset(qe_ic, 0, sizeof(struct qe_ic));
|
||||
|
||||
qe_ic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
|
||||
NR_QE_IC_INTS, &qe_ic_host_ops, 0);
|
||||
if (qe_ic->irqhost == NULL)
|
||||
|
|
|
@ -258,11 +258,10 @@ static struct uic * __init uic_init_one(struct device_node *node)
|
|||
|
||||
BUG_ON(! of_device_is_compatible(node, "ibm,uic"));
|
||||
|
||||
uic = alloc_bootmem(sizeof(*uic));
|
||||
uic = kzalloc(sizeof(*uic), GFP_KERNEL);
|
||||
if (! uic)
|
||||
return NULL; /* FIXME: panic? */
|
||||
|
||||
memset(uic, 0, sizeof(*uic));
|
||||
spin_lock_init(&uic->lock);
|
||||
indexp = of_get_property(node, "cell-index", &len);
|
||||
if (!indexp || (len != sizeof(u32))) {
|
||||
|
|
Loading…
Reference in a new issue