diff options
| -rw-r--r-- | arch/microblaze/configs/mmu_defconfig | 70 | ||||
| -rw-r--r-- | arch/microblaze/configs/nommu_defconfig | 91 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/hardirq.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/intc.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/irq.c | 9 | ||||
| -rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/timer.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/mm/init.c | 6 | 
8 files changed, 99 insertions, 85 deletions
| diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index bd0b85ec38f5..09c32962b66f 100644 --- a/arch/microblaze/configs/mmu_defconfig +++ b/arch/microblaze/configs/mmu_defconfig @@ -1,7 +1,7 @@  #  # Automatically generated make config: don't edit -# Linux kernel version: 2.6.30-rc6 -# Fri May 22 10:02:33 2009 +# Linux kernel version: 2.6.31-rc6 +# Tue Aug 18 11:00:02 2009  #  CONFIG_MICROBLAZE=y  # CONFIG_SWAP is not set @@ -18,7 +18,11 @@ CONFIG_GENERIC_TIME=y  CONFIG_GENERIC_CLOCKEVENTS=y  CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y  CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_CSUM=y +# CONFIG_PCI is not set +CONFIG_NO_DMA=y  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y  #  # General setup @@ -59,8 +63,8 @@ CONFIG_INITRAMFS_ROOT_GID=0  CONFIG_RD_GZIP=y  # CONFIG_RD_BZIP2 is not set  # CONFIG_RD_LZMA is not set -CONFIG_INITRAMFS_COMPRESSION_NONE=y -# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set +# CONFIG_INITRAMFS_COMPRESSION_NONE is not set +CONFIG_INITRAMFS_COMPRESSION_GZIP=y  # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set  # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set @@ -71,7 +75,6 @@ CONFIG_SYSCTL_SYSCALL=y  CONFIG_KALLSYMS=y  CONFIG_KALLSYMS_ALL=y  CONFIG_KALLSYMS_EXTRA_PASS=y -# CONFIG_STRIP_ASM_SYMS is not set  # CONFIG_HOTPLUG is not set  CONFIG_PRINTK=y  CONFIG_BUG=y @@ -84,13 +87,22 @@ CONFIG_TIMERFD=y  CONFIG_EVENTFD=y  # CONFIG_SHMEM is not set  CONFIG_AIO=y + +# +# Performance Counters +#  CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_STRIP_ASM_SYMS is not set  CONFIG_COMPAT_BRK=y  CONFIG_SLAB=y  # CONFIG_SLUB is not set  # CONFIG_SLOB is not set  # CONFIG_PROFILING is not set  # CONFIG_MARKERS is not set + +# +# GCOV-based kernel profiling +#  # CONFIG_SLOW_WORK is not set  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set  CONFIG_SLABINFO=y @@ -102,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y  # CONFIG_MODVERSIONS is not set  # CONFIG_MODULE_SRCVERSION_ALL is not set  CONFIG_BLOCK=y -# CONFIG_LBD is not set +CONFIG_LBDAF=y  # CONFIG_BLK_DEV_BSG is not set  # CONFIG_BLK_DEV_INTEGRITY is not set @@ -194,9 +206,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4  # CONFIG_PHYS_ADDR_T_64BIT is not set  CONFIG_ZONE_DMA_FLAG=0  CONFIG_VIRT_TO_BUS=y -CONFIG_UNEVICTABLE_LRU=y  CONFIG_HAVE_MLOCK=y  CONFIG_HAVE_MLOCKED_PAGE_BIT=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096  #  # Exectuable file formats @@ -262,6 +274,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"  # CONFIG_ECONET is not set  # CONFIG_WAN_ROUTER is not set  # CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set  # CONFIG_NET_SCHED is not set  # CONFIG_DCB is not set @@ -325,7 +338,6 @@ CONFIG_MISC_DEVICES=y  # CONFIG_ATA is not set  # CONFIG_MD 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 @@ -344,7 +356,7 @@ CONFIG_NET_ETHERNET=y  # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set  # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set  # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -# CONFIG_B44 is not set +# CONFIG_KS8842 is not set  CONFIG_NETDEV_1000=y  CONFIG_NETDEV_10000=y @@ -410,6 +422,11 @@ CONFIG_LEGACY_PTY_COUNT=256  # CONFIG_TCG_TPM is not set  # CONFIG_I2C is not set  # CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set  CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y  # CONFIG_GPIOLIB is not set  # CONFIG_W1 is not set @@ -418,12 +435,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y  # CONFIG_THERMAL is not set  # CONFIG_THERMAL_HWMON is not set  # CONFIG_WATCHDOG is not set -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -# CONFIG_SSB is not set  #  # Multifunction device drivers @@ -433,22 +444,7 @@ CONFIG_SSB_POSSIBLE=y  # CONFIG_HTC_PASIC3 is not set  # CONFIG_MFD_TMIO is not set  # CONFIG_REGULATOR is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set +# CONFIG_MEDIA_SUPPORT is not set  #  # Graphics support @@ -469,9 +465,12 @@ CONFIG_SSB_POSSIBLE=y  # CONFIG_NEW_LEDS is not set  # CONFIG_ACCESSIBILITY is not set  # CONFIG_RTC_CLASS is not set -# CONFIG_DMADEVICES is not set  # CONFIG_AUXDISPLAY is not set  # CONFIG_UIO is not set + +# +# TI VLYNQ +#  # CONFIG_STAGING is not set  # @@ -485,12 +484,15 @@ CONFIG_EXT2_FS=y  # CONFIG_REISERFS_FS is not set  # CONFIG_JFS_FS is not set  # CONFIG_FS_POSIX_ACL is not set -CONFIG_FILE_LOCKING=y  # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set  # CONFIG_OCFS2_FS is not set  # CONFIG_BTRFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y  # CONFIG_DNOTIFY is not set  # CONFIG_INOTIFY is not set +CONFIG_INOTIFY_USER=y  # CONFIG_QUOTA is not set  # CONFIG_AUTOFS_FS is not set  # CONFIG_AUTOFS4_FS is not set @@ -678,6 +680,7 @@ CONFIG_DEBUG_INFO=y  # CONFIG_SYSCTL_SYSCALL_CHECK is not set  # CONFIG_PAGE_POISONING is not set  # CONFIG_SAMPLES is not set +# CONFIG_KMEMCHECK is not set  CONFIG_EARLY_PRINTK=y  CONFIG_HEART_BEAT=y  CONFIG_DEBUG_BOOTMEM=y @@ -793,6 +796,5 @@ CONFIG_ZLIB_INFLATE=y  CONFIG_DECOMPRESS_GZIP=y  CONFIG_HAS_IOMEM=y  CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y  CONFIG_HAVE_LMB=y  CONFIG_NLATTR=y diff --git a/arch/microblaze/configs/nommu_defconfig b/arch/microblaze/configs/nommu_defconfig index 4ef6af0a8f31..8b638615a972 100644 --- a/arch/microblaze/configs/nommu_defconfig +++ b/arch/microblaze/configs/nommu_defconfig @@ -1,7 +1,7 @@  #  # Automatically generated make config: don't edit -# Linux kernel version: 2.6.30-rc5 -# Mon May 11 09:01:02 2009 +# Linux kernel version: 2.6.31-rc6 +# Tue Aug 18 10:35:30 2009  #  CONFIG_MICROBLAZE=y  # CONFIG_SWAP is not set @@ -17,9 +17,12 @@ CONFIG_GENERIC_TIME=y  # CONFIG_GENERIC_TIME_VSYSCALL is not set  CONFIG_GENERIC_CLOCKEVENTS=y  CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_CSUM=y  # CONFIG_PCI is not set -# CONFIG_NO_DMA is not set +CONFIG_NO_DMA=y  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y  #  # General setup @@ -64,7 +67,6 @@ CONFIG_SYSCTL_SYSCALL=y  CONFIG_KALLSYMS=y  CONFIG_KALLSYMS_ALL=y  CONFIG_KALLSYMS_EXTRA_PASS=y -# CONFIG_STRIP_ASM_SYMS is not set  # CONFIG_HOTPLUG is not set  CONFIG_PRINTK=y  CONFIG_BUG=y @@ -76,13 +78,23 @@ CONFIG_SIGNALFD=y  CONFIG_TIMERFD=y  CONFIG_EVENTFD=y  CONFIG_AIO=y + +# +# Performance Counters +#  CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_STRIP_ASM_SYMS is not set  CONFIG_COMPAT_BRK=y  CONFIG_SLAB=y  # CONFIG_SLUB is not set  # CONFIG_SLOB is not set  # CONFIG_PROFILING is not set  # CONFIG_MARKERS is not set + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set  # CONFIG_SLOW_WORK is not set  # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set  CONFIG_SLABINFO=y @@ -95,7 +107,7 @@ CONFIG_MODULE_UNLOAD=y  # CONFIG_MODVERSIONS is not set  # CONFIG_MODULE_SRCVERSION_ALL is not set  CONFIG_BLOCK=y -# CONFIG_LBD is not set +CONFIG_LBDAF=y  # CONFIG_BLK_DEV_BSG is not set  # CONFIG_BLK_DEV_INTEGRITY is not set @@ -156,8 +168,16 @@ CONFIG_CMDLINE_BOOL=y  CONFIG_CMDLINE="console=ttyUL0,115200"  # CONFIG_CMDLINE_FORCE is not set  CONFIG_OF=y -CONFIG_OF_DEVICE=y  CONFIG_PROC_DEVICETREE=y + +# +# Advanced setup +# + +# +# Default settings for advanced configuration options are used +# +CONFIG_KERNEL_START=0x90000000  CONFIG_SELECT_MEMORY_MODEL=y  CONFIG_FLATMEM_MANUAL=y  # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -169,7 +189,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4  # CONFIG_PHYS_ADDR_T_64BIT is not set  CONFIG_ZONE_DMA_FLAG=0  CONFIG_VIRT_TO_BUS=y -CONFIG_UNEVICTABLE_LRU=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096  CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1  # @@ -237,6 +257,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"  # CONFIG_ECONET is not set  # CONFIG_WAN_ROUTER is not set  # CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set  # CONFIG_NET_SCHED is not set  # CONFIG_DCB is not set @@ -254,7 +275,11 @@ CONFIG_WIRELESS=y  CONFIG_WIRELESS_OLD_REGULATORY=y  # CONFIG_WIRELESS_EXT is not set  # CONFIG_LIB80211 is not set -# CONFIG_MAC80211 is not set + +# +# CFG80211 needs to be enabled for MAC80211 +# +CONFIG_MAC80211_DEFAULT_PS_VALUE=0  # CONFIG_WIMAX is not set  # CONFIG_RFKILL is not set  # CONFIG_NET_9P is not set @@ -353,6 +378,7 @@ CONFIG_MTD_UCLINUX=y  # 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_COW_COMMON is not set @@ -364,6 +390,7 @@ 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_ENCLOSURE_SERVICES is not set  # CONFIG_C2PORT is not set @@ -383,7 +410,6 @@ CONFIG_MISC_DEVICES=y  # CONFIG_ATA is not set  # CONFIG_MD 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 @@ -402,7 +428,7 @@ CONFIG_NET_ETHERNET=y  # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set  # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set  # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -# CONFIG_B44 is not set +# CONFIG_KS8842 is not set  CONFIG_NETDEV_1000=y  CONFIG_NETDEV_10000=y @@ -463,23 +489,25 @@ CONFIG_HW_RANDOM=y  # CONFIG_HW_RANDOM_TIMERIOMEM is not set  # CONFIG_RTC is not set  # CONFIG_GEN_RTC is not set +# CONFIG_XILINX_HWICAP 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  # CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB 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_THERMAL_HWMON is not set  # CONFIG_WATCHDOG is not set -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -# CONFIG_SSB is not set  #  # Multifunction device drivers @@ -489,22 +517,7 @@ CONFIG_SSB_POSSIBLE=y  # CONFIG_HTC_PASIC3 is not set  # CONFIG_MFD_TMIO is not set  # CONFIG_REGULATOR is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -CONFIG_DAB=y +# CONFIG_MEDIA_SUPPORT is not set  #  # Graphics support @@ -520,9 +533,10 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y  # CONFIG_DISPLAY_SUPPORT is not set  # CONFIG_SOUND is not set  CONFIG_USB_SUPPORT=y -# CONFIG_USB_ARCH_HAS_HCD is not set +CONFIG_USB_ARCH_HAS_HCD=y  # CONFIG_USB_ARCH_HAS_OHCI is not set  # CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set  # CONFIG_USB_OTG_WHITELIST is not set  # CONFIG_USB_OTG_BLACKLIST_HUB is not set @@ -543,9 +557,12 @@ CONFIG_USB_SUPPORT=y  # CONFIG_NEW_LEDS is not set  # CONFIG_ACCESSIBILITY is not set  # CONFIG_RTC_CLASS is not set -# CONFIG_DMADEVICES is not set  # CONFIG_AUXDISPLAY is not set  # CONFIG_UIO is not set + +# +# TI VLYNQ +#  # CONFIG_STAGING is not set  # @@ -558,12 +575,15 @@ CONFIG_EXT2_FS=y  # CONFIG_REISERFS_FS is not set  # CONFIG_JFS_FS is not set  CONFIG_FS_POSIX_ACL=y -CONFIG_FILE_LOCKING=y  # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set  # CONFIG_OCFS2_FS is not set  # CONFIG_BTRFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y  # CONFIG_DNOTIFY is not set  # CONFIG_INOTIFY is not set +CONFIG_INOTIFY_USER=y  # CONFIG_QUOTA is not set  # CONFIG_AUTOFS_FS is not set  # CONFIG_AUTOFS4_FS is not set @@ -813,6 +833,5 @@ CONFIG_GENERIC_FIND_LAST_BIT=y  CONFIG_ZLIB_INFLATE=y  CONFIG_HAS_IOMEM=y  CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y  CONFIG_HAVE_LMB=y  CONFIG_NLATTR=y diff --git a/arch/microblaze/include/asm/hardirq.h b/arch/microblaze/include/asm/hardirq.h index 41e1e1aa36ac..cd1ac9aad56c 100644 --- a/arch/microblaze/include/asm/hardirq.h +++ b/arch/microblaze/include/asm/hardirq.h @@ -12,8 +12,6 @@  /* should be defined in each interrupt controller driver */  extern unsigned int get_irq(struct pt_regs *regs); -#define ack_bad_irq ack_bad_irq -void ack_bad_irq(unsigned int irq);  #include <asm-generic/hardirq.h>  #endif /* _ASM_MICROBLAZE_HARDIRQ_H */ diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c index b15605299a57..6eea6f92b84e 100644 --- a/arch/microblaze/kernel/intc.c +++ b/arch/microblaze/kernel/intc.c @@ -12,6 +12,7 @@  #include <linux/irq.h>  #include <asm/page.h>  #include <linux/io.h> +#include <linux/bug.h>  #include <asm/prom.h>  #include <asm/irq.h> @@ -130,6 +131,7 @@ void __init init_IRQ(void)  		if (intc)  			break;  	} +	BUG_ON(!intc);  	intc_baseaddr = *(int *) of_get_property(intc, "reg", NULL);  	intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE); diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index f688ee93e3b9..7d5ddd62d4d2 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c @@ -30,15 +30,6 @@ unsigned int irq_of_parse_and_map(struct device_node *dev, int index)  }  EXPORT_SYMBOL_GPL(irq_of_parse_and_map); -/* - * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves. - */ -void ack_bad_irq(unsigned int irq) -{ -	printk(KERN_WARNING "unexpected IRQ trap at vector %02x\n", irq); -} -  static u32 concurrent_irq;  void do_IRQ(struct pt_regs *regs) diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 216db817beb6..457216097dfd 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S @@ -313,7 +313,7 @@ ENTRY(sys_call_table)  	.long sys_fchmodat  	.long sys_faccessat  	.long sys_ni_syscall /* pselect6 */ -	.long sys_ni_syscall /* sys_ppoll */ +	.long sys_ppoll  	.long sys_unshare		/* 310 */  	.long sys_set_robust_list  	.long sys_get_robust_list diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index bdfa2f9f0c81..5499deae7fa6 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -22,6 +22,7 @@  #include <linux/clocksource.h>  #include <linux/clockchips.h>  #include <linux/io.h> +#include <linux/bug.h>  #include <asm/cpuinfo.h>  #include <asm/setup.h>  #include <asm/prom.h> @@ -234,6 +235,7 @@ void __init time_init(void)  		if (timer)  			break;  	} +	BUG_ON(!timer);  	timer_baseaddr = *(int *) of_get_property(timer, "reg", NULL);  	timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE); diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 8d92c4efe9a4..f207f1a94dbc 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -130,13 +130,13 @@ void __init setup_memory(void)  	 * (in case the address isn't page-aligned).  	 */  #ifndef CONFIG_MMU -	map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)_end)), +	map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)klimit)),  					min_low_pfn, max_low_pfn);  #else  	map_size = init_bootmem_node(&contig_page_data, -		PFN_UP(TOPHYS((u32)_end)), min_low_pfn, max_low_pfn); +		PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn);  #endif -	lmb_reserve(PFN_UP(TOPHYS((u32)_end)) << PAGE_SHIFT, map_size); +	lmb_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size);  	/* free bootmem is whole main memory */  	free_bootmem(memory_start, memory_size); | 
