Commit 058e88d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-4.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze updates from Michal Simek:

 - timer fix

 - use simplified macro in dma.c

 - wire-up new syscall

 - remove asp-generic wrappers

 - fix MMU table handling

 - defconfig updates

 - low-level entry.S changes

* tag 'microblaze-4.13-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix MSR flags when returning from exception
  microblaze: Separate GP registers from MSR handling
  microblaze: Enabling CONFIG_BRIDGE in mmu_defconfig
  microblaze: Enabling CONFIGS related to MTD
  microblaze: Update defconfigs
  microblaze: mm: Flush TLB to ensure correct mapping when higmem ON
  microblaze: remove asm-generic wrapper headers
  microblaze: wire up statx syscall
  microblaze: Set ->min_delta_ticks and ->max_delta_ticks for timer
  microblaze: use sg_phys()
parents 241e5e6f 14ef905b

arch/microblaze/configs/mmu_defconfig

+7 −9
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_AUDIT_LOGINUID_IMMUTABLE=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_SYSFS_DEPRECATED=y
@@ -33,10 +31,12 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_BRIDGE=m

CONFIG_MTD=y

CONFIG_PROC_DEVICETREE=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_NETDEVICES=y
@@ -47,9 +47,9 @@ CONFIG_XILINX_LL_TEMAC=y 
# CONFIG_VT is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_UARTLITE=y

CONFIG_SERIAL_UARTLITE_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_XILINX_HWICAP=y

CONFIG_I2C=y
@@ -66,7 +66,6 @@ CONFIG_FB=y 
CONFIG_FB_XILINX=y

# CONFIG_USB_SUPPORT is not set

CONFIG_UIO=y

CONFIG_UIO_PDRV=y

CONFIG_UIO_PDRV_GENIRQ=y

CONFIG_UIO_DMEM_GENIRQ=y

CONFIG_EXT2_FS=y
@@ -77,14 +76,13 @@ CONFIG_NFS_FS=y 
CONFIG_CIFS=y

CONFIG_CIFS_STATS=y

CONFIG_CIFS_STATS2=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_INFO=y

CONFIG_KGDB=y

CONFIG_KGDB_TESTS=y

CONFIG_KGDB_KDB=y

CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y
 
# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/microblaze/configs/nommu_defconfig

+3 −14
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_AUDIT_LOGINUID_IMMUTABLE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_IKCONFIG=y
@@ -34,18 +31,15 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_RAM=y

CONFIG_MTD_UCLINUX=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_NETDEVICES=y
@@ -56,9 +50,9 @@ CONFIG_XILINX_LL_TEMAC=y 
# CONFIG_VT is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_UARTLITE=y

CONFIG_SERIAL_UARTLITE_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_XILINX_HWICAP=y

CONFIG_I2C=y
@@ -74,10 +68,6 @@ CONFIG_XILINX_WATCHDOG=y 
CONFIG_FB=y

CONFIG_FB_XILINX=y

# CONFIG_USB_SUPPORT is not set

CONFIG_UIO=y

CONFIG_UIO_PDRV=y

CONFIG_UIO_PDRV_GENIRQ=y

CONFIG_UIO_DMEM_GENIRQ=y

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_CRAMFS=y
@@ -85,10 +75,10 @@ CONFIG_ROMFS_FS=y 
CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NLS=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SLAB=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_INFO=y

CONFIG_EARLY_PRINTK=y

CONFIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=y
@@ -97,4 +87,3 @@ CONFIG_CRYPTO_MD4=y 
CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_DES=y
 
# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/microblaze/include/asm/Kbuild

+44 −1
Original line number Diff line number Diff line 


generic-y += barrier.h

generic-y += bitops.h

generic-y += bitsperlong.h

generic-y += bug.h

generic-y += bugs.h

generic-y += clkdev.h

generic-y += device.h

generic-y += div64.h

generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += extable.h

generic-y += fb.h

generic-y += fcntl.h

generic-y += hardirq.h

generic-y += ioctl.h

generic-y += ioctls.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += kdebug.h

generic-y += kmap_types.h

generic-y += kprobes.h

generic-y += linkage.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

generic-y += mman.h

generic-y += msgbuf.h

generic-y += param.h

generic-y += parport.h

generic-y += percpu.h

generic-y += poll.h

generic-y += preempt.h

generic-y += resource.h

generic-y += sembuf.h

generic-y += serial.h

generic-y += shmbuf.h

generic-y += shmparam.h

generic-y += siginfo.h

generic-y += signal.h

generic-y += socket.h

generic-y += sockios.h

generic-y += stat.h

generic-y += statfs.h

generic-y += swab.h

generic-y += syscalls.h

generic-y += termbits.h

generic-y += termios.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += ucontext.h

generic-y += vga.h

generic-y += word-at-a-time.h

generic-y += kprobes.h
 
generic-y += xor.h

arch/microblaze/include/asm/bitops.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bitops.h>

arch/microblaze/include/asm/bug.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/bug.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE