Merge branch 'microblaze' of git://git-dev.xilinx.com/linux-2.6-xlnx into 2.6.31...

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/microblaze/configs/mmu_defconfig
index 09c32962b66f76f4fa24fd9eb76be75a56428b47,c199afe7a393f5b34de4fa866ca9dd9f7c164127..a5b66bef12c508a84ad59d803c0ef37cb7611417
--- 1/arch/microblaze/configs/mmu_defconfig
--- 2/arch/microblaze/configs/mmu_defconfig
+++ b/arch/microblaze/configs/mmu_defconfig
@@@ -18,11 -18,9 +18,12 @@@ CONFIG_GENERIC_TIME=
  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_DTC=y
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 +CONFIG_CONSTRUCTORS=y
  
  #
  # General setup
@@@ -80,19 -81,14 +83,19 @@@ CONFIG_PRINTK=
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
  # CONFIG_BASE_FULL is not set
- # CONFIG_FUTEX is not set
- # CONFIG_EPOLL is not set
- # CONFIG_SIGNALFD is not set
+ CONFIG_FUTEX=y
+ CONFIG_EPOLL=y
+ CONFIG_SIGNALFD=y
  CONFIG_TIMERFD=y
  CONFIG_EVENTFD=y
- # CONFIG_SHMEM is not set
+ CONFIG_SHMEM=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
@@@ -356,8 -349,13 +360,14 @@@ CONFIG_NET_ETHERNET=
  # 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_KS8842 is not set
+ # CONFIG_B44 is not set
+ CONFIG_XILINX_EMACLITE=y
  CONFIG_NETDEV_1000=y
+ CONFIG_XILINX_LLTEMAC=y
+ # CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_RGMII is not set
+ CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y
+ # CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_MII is not set
  CONFIG_NETDEV_10000=y
  
  #
@@@ -465,12 -479,14 +475,17 @@@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=
  # 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_XILINX_EDK=y
+ # CONFIG_XILINX_LLDMA_USE_DCR is not set
+ CONFIG_XILINX_DRIVERS=y
+ CONFIG_NEED_XILINX_LLDMA=y
+ CONFIG_NEED_XILINX_IPIF=y
  # CONFIG_UIO is not set
 +
 +#
 +# TI VLYNQ
 +#
  # CONFIG_STAGING is not set
  
  #

diff --cc arch/microblaze/include/asm/io.h
Simple merge

diff --cc arch/microblaze/include/asm/page.h
Simple merge

diff --cc arch/microblaze/include/asm/pci.h
index 9f0df5faf2c88d1d89b37ba56c7b535e0e29f4ba,dd987d66af2374934223ac21b6d3f6c97f05615c..68a9b2ff7748d3bea68cd4776b57b024e13292fd
--- 1/arch/microblaze/include/asm/pci.h
--- 2/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@@ -1,1 -1,20 +1,19 @@@
- #include <asm-generic/pci.h>
+ #ifndef __ASM_MICROBLAZE_PCI_H
+ #define __ASM_MICROBLAZE_PCI_H
+ #ifdef __KERNEL__
+ 
+ /* PCI support is still under development. This file provides the definition
+  * for PCI_DMA_BUS_IS_PHYS, which enables SCSI support. This is to support
+  * USB Mass Storage devices, such as thumb drives.
+  */
+ 
+ #include <linux/io.h>
+ 
+ /* The PCI address space does equal the physical memory
+  * address space (no IOMMU).  The IDE and SCSI device layers use
+  * this boolean for bounce buffer decisions.
+  */
+ #define PCI_DMA_BUS_IS_PHYS     (1)
+ 
+ #endif        /* __KERNEL__ */
+ #endif        /* __ASM_MICROBLAZE_PCI_H */
 -

diff --cc arch/microblaze/kernel/entry.S
Simple merge

diff --cc arch/microblaze/kernel/ptrace.c
index 53ff39af6a5c0eebfcf156dd02969d231896229d,791d687bba63d9f32368050787806abdeaf974ea..4b3ac32754de1f747d069dc69d2e6e377954fdfe
--- 1/arch/microblaze/kernel/ptrace.c
--- 2/arch/microblaze/kernel/ptrace.c
+++ b/arch/microblaze/kernel/ptrace.c
@@@ -27,8 -27,13 +27,12 @@@
  #include <linux/kernel.h>
  #include <linux/mm.h>
  #include <linux/sched.h>
 -#include <linux/smp_lock.h>
  #include <linux/ptrace.h>
  #include <linux/signal.h>
+ #include <linux/elf.h>
+ #include <linux/audit.h>
+ #include <linux/seccomp.h>
+ #include <linux/tracehook.h>
  
  #include <linux/errno.h>
  #include <asm/processor.h>

diff --cc arch/microblaze/kernel/vmlinux.lds.S
index d34d38dcd12c71a733da03bee3b0e017f9320ca8,c139bf5b86a2a899c8558f11b2384cfdea7a0358..30e23439bba4841951a8224cfa0ecb3f14b79a7f
--- 1/arch/microblaze/kernel/vmlinux.lds.S
--- 2/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@@ -61,12 -66,14 +66,15 @@@ SECTIONS 
        }
  
        _sdata = . ;
-       .data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */
+       /* page aligned when MMU used - origin 0x4 */
+       .data ALIGN (4096) : AT(ADDR(.data) - LOAD_OFFSET) {
 -              *(.data)
 +              DATA_DATA
 +              CONSTRUCTORS
        }
        . = ALIGN(32);
-       .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+       .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
+               *(.data.cacheline_aligned)
+       }
        _edata = . ;
  
        /* Reserve some low RAM for r0 based memory references */
@@@ -97,14 -106,16 +107,14 @@@
        __init_begin = .;
  
        . = ALIGN(4096);
-       .init.text : {
+       .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
                _sinittext = . ;
 -              *(.init.text)
 -              *(.exit.text)
 -              *(.exit.data)
 +              INIT_TEXT
                _einittext = .;
        }
  
-       .init.data : {
+       .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
 -              *(.init.data)
 +              INIT_DATA
        }
  
        . = ALIGN(4);

diff --cc drivers/Makefile
index 4cac3e7bfaa267f5d77875dbf9b27273c3d9e6b2,bff9f3ef764cf632d8a7dc4251dfe3d902d7cb30..0c43149239c0daf2461687b3dd52104936ba4d05
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -107,7 -106,7 +107,8 @@@ obj-$(CONFIG_PPC_PS3)              += ps3
  obj-$(CONFIG_OF)              += of/
  obj-$(CONFIG_SSB)             += ssb/
  obj-$(CONFIG_VIRTIO)          += virtio/
 +obj-$(CONFIG_VLYNQ)           += vlynq/
  obj-$(CONFIG_STAGING)         += staging/
  obj-y                         += platform/
 -
 +obj-y                         += ieee802154/
+ obj-y                         += xilinx_common/

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/net/Makefile
index 9b95daff391d13ad057866cf4f3fa8260e31eaa6,77c7f12ac4c6d88e9c1ace94be1fa565efe3a1ba..2f985e065283622daa8373145ac9d9f0445f65ca
--- 1/drivers/net/Makefile
--- 2/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@@ -285,4 -274,7 +284,5 @@@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.
  obj-$(CONFIG_SFC) += sfc/
  
  obj-$(CONFIG_WIMAX) += wimax/
 -
+ obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
  obj-$(CONFIG_XILINX_LLTEMAC) += xilinx_lltemac/
 -

diff --cc drivers/usb/Kconfig
Simple merge