--- /dev/null
+From 473e162eea465e60578edb93341752e7f1c1dacc Mon Sep 17 00:00:00 2001
+From: Jesper Nilsson <jesper.nilsson@axis.com>
+Date: Mon, 24 Oct 2011 11:19:25 +0200
+Subject: CRIS: Add _sdata to vmlinux.lds.S
+
+From: Jesper Nilsson <jesper.nilsson@axis.com>
+
+commit 473e162eea465e60578edb93341752e7f1c1dacc upstream.
+
+Fixes link error:
+ LD vmlinux
+kernel/built-in.o: In function `core_kernel_data':
+(.text+0x13e44): undefined reference to `_sdata'
+
+Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/cris/kernel/vmlinux.lds.S | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/cris/kernel/vmlinux.lds.S
++++ b/arch/cris/kernel/vmlinux.lds.S
+@@ -52,6 +52,7 @@ SECTIONS
+
+ EXCEPTION_TABLE(4)
+
++ _sdata = .;
+ RODATA
+
+ . = ALIGN (4);
--- /dev/null
+From 74f077d2a7651409c44bb323471f219a4b0d2aab Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Mon, 2 Apr 2012 13:40:17 +0200
+Subject: cris: posix_types.h, include asm-generic/posix_types.h
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+commit 74f077d2a7651409c44bb323471f219a4b0d2aab upstream.
+
+Without that I cannot build anything:
+In file included from include/linux/page-flags.h:8:0,
+ from kernel/bounds.c:9:
+include/linux/types.h:25:1: error: unknown type name '__kernel_ino_t'
+include/linux/types.h:29:1: error: unknown type name '__kernel_off_t'
+...
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Cc: Mikael Starvik <starvik@axis.com>
+Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
+Cc: linux-cris-kernel@axis.com
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/cris/include/asm/posix_types.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/cris/include/asm/posix_types.h
++++ b/arch/cris/include/asm/posix_types.h
+@@ -33,4 +33,6 @@ typedef int __kernel_ptrdiff_t;
+ typedef unsigned short __kernel_old_dev_t;
+ #define __kernel_old_dev_t __kernel_old_dev_t
+
++#include <asm-generic/posix_types.h>
++
+ #endif /* __ARCH_CRIS_POSIX_TYPES_H */
--- /dev/null
+From 7b91747d42a1012e3781dd09fa638d113809e3fd Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Wed, 18 Apr 2012 21:58:43 +0200
+Subject: cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
+
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+commit 7b91747d42a1012e3781dd09fa638d113809e3fd upstream.
+
+Most of these have been purged years ago. This one silently lived
+on until commit 69349c2dc01c489eccaa4c472542c08e370c6d7e
+
+ "kconfig: fix IS_ENABLED to not require all options to be defined"
+
+In the above, we use some macro trickery to create a conditional that
+is valid in CPP and in C usage. However that trickery doesn't sit
+well if you have the legacy "-traditional" flag enabled. You'll get:
+
+ AS arch/cris/arch-v10/lib/checksum.o
+In file included from <command-line>:4:0:
+include/linux/kconfig.h:23:0: error: syntax error in macro parameter list
+make[2]: *** [arch/cris/arch-v10/lib/checksum.o] Error 1
+
+Everything builds fine w/o "-traditional" so simply drop it from this
+location as well.
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/cris/arch-v10/lib/Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/arch/cris/arch-v10/lib/Makefile
++++ b/arch/cris/arch-v10/lib/Makefile
+@@ -2,8 +2,5 @@
+ # Makefile for Etrax-specific library files..
+ #
+
+-
+-EXTRA_AFLAGS := -traditional
+-
+ lib-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
+
--- /dev/null
+From 520c41cf2fa029d1e8b923ac2026f96664f17c4b Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Wed, 11 Jul 2012 16:27:52 +0200
+Subject: drm/i915/lvds: ditch ->prepare special case
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 520c41cf2fa029d1e8b923ac2026f96664f17c4b upstream.
+
+LVDS is the first output where dpms on/off and prepare/commit don't
+perfectly match. Now the idea behind this special case seems to be
+that for simple resolution changes on the LVDS we don't need to stop
+the pipe, because (at least on newer chips) we can adjust the panel
+fitter on the fly.
+
+There are a few problems with the current code though:
+- We still stop and restart the pipe unconditionally, because the crtc
+ helper code isn't flexible enough.
+- We show some ugly flickering, especially when changing crtcs (this
+ the crtc helper would actually take into account, but we don't
+ implement the encoder->get_crtc callback required to make this work
+ properly).
+
+So it doesn't even work as advertised. I agree that it would be nice
+to do resolution changes on LVDS (and also eDP) whithout blacking the
+screen where the panel fitter allows to do that. But imo we should
+implement this as a special case a few layers up in the mode set code,
+akin to how we already detect simple framebuffer changes (and only
+update the required registers with ->mode_set_base).
+
+Until this is all in place, make our lives easier and just rip it out.
+
+Also note that this seems to fix actual bugs with enabling the lvds
+output, see:
+
+http://lists.freedesktop.org/archives/intel-gfx/2012-July/018614.html
+
+Cc: Takashi Iwai <tiwai@suse.de>
+Cc: Giacomo Comes <comes@naic.edu>
+Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
+Tested-by: Takashi Iwai <tiwai@suse.de>
+Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Cc: Haitao Zhang <haitao.zhang@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -408,13 +408,7 @@ static void intel_lvds_prepare(struct dr
+ {
+ struct intel_lvds *intel_lvds = to_intel_lvds(encoder);
+
+- /*
+- * Prior to Ironlake, we must disable the pipe if we want to adjust
+- * the panel fitter. However at all other times we can just reset
+- * the registers regardless.
+- */
+- if (!HAS_PCH_SPLIT(encoder->dev) && intel_lvds->pfit_dirty)
+- intel_lvds_disable(intel_lvds);
++ intel_lvds_disable(intel_lvds);
+ }
+
+ static void intel_lvds_commit(struct drm_encoder *encoder)
--- /dev/null
+From 8c8296223f3abb142be8fc31711b18a704c0e7d8 Mon Sep 17 00:00:00 2001
+From: yonghua zheng <younghua.zheng@gmail.com>
+Date: Tue, 13 Aug 2013 16:01:03 -0700
+Subject: fs/proc/task_mmu.c: fix buffer overflow in add_page_map()
+
+From: yonghua zheng <younghua.zheng@gmail.com>
+
+commit 8c8296223f3abb142be8fc31711b18a704c0e7d8 upstream.
+
+Recently we met quite a lot of random kernel panic issues after enabling
+CONFIG_PROC_PAGE_MONITOR. After debuggind we found this has something
+to do with following bug in pagemap:
+
+In struct pagemapread:
+
+ struct pagemapread {
+ int pos, len;
+ pagemap_entry_t *buffer;
+ bool v2;
+ };
+
+pos is number of PM_ENTRY_BYTES in buffer, but len is the size of
+buffer, it is a mistake to compare pos and len in add_page_map() for
+checking buffer is full or not, and this can lead to buffer overflow and
+random kernel panic issue.
+
+Correct len to be total number of PM_ENTRY_BYTES in buffer.
+
+[akpm@linux-foundation.org: document pagemapread.pos and .len units, fix PM_ENTRY_BYTES definition]
+Signed-off-by: Yonghua Zheng <younghua.zheng@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/proc/task_mmu.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/fs/proc/task_mmu.c
++++ b/fs/proc/task_mmu.c
+@@ -679,14 +679,14 @@ typedef struct {
+ } pagemap_entry_t;
+
+ struct pagemapread {
+- int pos, len;
++ int pos, len; /* units: PM_ENTRY_BYTES, not bytes */
+ pagemap_entry_t *buffer;
+ };
+
+ #define PAGEMAP_WALK_SIZE (PMD_SIZE)
+ #define PAGEMAP_WALK_MASK (PMD_MASK)
+
+-#define PM_ENTRY_BYTES sizeof(u64)
++#define PM_ENTRY_BYTES sizeof(pagemap_entry_t)
+ #define PM_STATUS_BITS 3
+ #define PM_STATUS_OFFSET (64 - PM_STATUS_BITS)
+ #define PM_STATUS_MASK (((1LL << PM_STATUS_BITS) - 1) << PM_STATUS_OFFSET)
+@@ -913,8 +913,8 @@ static ssize_t pagemap_read(struct file
+ if (!count)
+ goto out_task;
+
+- pm.len = PM_ENTRY_BYTES * (PAGEMAP_WALK_SIZE >> PAGE_SHIFT);
+- pm.buffer = kmalloc(pm.len, GFP_TEMPORARY);
++ pm.len = (PAGEMAP_WALK_SIZE >> PAGE_SHIFT);
++ pm.buffer = kmalloc(pm.len * PM_ENTRY_BYTES, GFP_TEMPORARY);
+ ret = -ENOMEM;
+ if (!pm.buffer)
+ goto out_task;
--- /dev/null
+From 6b90466cfec2a2fe027187d675d8d14217c12d82 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Mon, 12 Nov 2012 10:16:09 +0100
+Subject: HID: microsoft: do not use compound literal - fix build
+
+From: Jiri Slaby <jslaby@suse.cz>
+
+commit 6b90466cfec2a2fe027187d675d8d14217c12d82 upstream.
+
+In patch "HID: microsoft: fix invalid rdesc for 3k kbd" I fixed
+support for MS 3k keyboards. However the added check using memcmp and
+a compound statement breaks build on architectures where memcmp is a
+macro with parameters.
+
+hid-microsoft.c:51:18: error: macro "memcmp" passed 6 arguments, but takes just 3
+
+On x86_64, memcmp is a function, so I did not see the error.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-microsoft.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/hid/hid-microsoft.c
++++ b/drivers/hid/hid-microsoft.c
+@@ -47,9 +47,9 @@ static __u8 *ms_report_fixup(struct hid_
+ rdesc[559] = 0x45;
+ }
+ /* the same as above (s/usage/physical/) */
+- if ((quirks & MS_RDESC_3K) && *rsize == 106 &&
+- !memcmp((char []){ 0x19, 0x00, 0x29, 0xff },
+- &rdesc[94], 4)) {
++ if ((quirks & MS_RDESC_3K) && *rsize == 106 && rdesc[94] == 0x19 &&
++ rdesc[95] == 0x00 && rdesc[96] == 0x29 &&
++ rdesc[97] == 0xff) {
+ rdesc[94] = 0x35;
+ rdesc[96] = 0x45;
+ }
--- /dev/null
+From d0e045401f268a8de6f87d65678214748b772680 Mon Sep 17 00:00:00 2001
+From: Michal Simek <michal.simek@xilinx.com>
+Date: Fri, 21 Dec 2012 10:53:59 +0100
+Subject: microblaze: Update microblaze defconfigs
+
+From: Michal Simek <michal.simek@xilinx.com>
+
+commit d0e045401f268a8de6f87d65678214748b772680 upstream.
+
+The main reason is 0-day testing system which can directly
+use these defconfigs for testing.
+
+Enable support for all xilinx drivers which Microblaze
+can use and disable dependency on external rootfs.cpio.
+There is only one exception which is axi ethernet driver
+which still uses NO_IRQ which is not defined for Microblaze.
+
+Signed-off-by: Michal Simek <michal.simek@xilinx.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/microblaze/configs/mmu_defconfig | 49 ++++++++++++++--------
+ arch/microblaze/configs/nommu_defconfig | 71 ++++++++++++++++++--------------
+ 2 files changed, 75 insertions(+), 45 deletions(-)
+
+--- a/arch/microblaze/configs/mmu_defconfig
++++ b/arch/microblaze/configs/mmu_defconfig
+@@ -1,25 +1,22 @@
+ CONFIG_EXPERIMENTAL=y
+ 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
+ CONFIG_SYSFS_DEPRECATED_V2=y
+-CONFIG_BLK_DEV_INITRD=y
+-CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
+-CONFIG_INITRAMFS_COMPRESSION_GZIP=y
+-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+-CONFIG_EXPERT=y
+ CONFIG_KALLSYMS_ALL=y
+-CONFIG_KALLSYMS_EXTRA_PASS=y
+-# CONFIG_HOTPLUG is not set
+ # CONFIG_BASE_FULL is not set
+-# CONFIG_FUTEX is not set
+-# CONFIG_EPOLL is not set
+-# CONFIG_SIGNALFD is not set
+-# CONFIG_SHMEM is not set
++CONFIG_EMBEDDED=y
+ CONFIG_SLAB=y
+ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+ # CONFIG_BLK_DEV_BSG is not set
++CONFIG_PARTITION_ADVANCED=y
++# CONFIG_EFI_PARTITION is not set
+ CONFIG_OPT_LIB_ASM=y
+ CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
+ CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
+@@ -37,33 +34,53 @@ CONFIG_UNIX=y
+ CONFIG_INET=y
+ # CONFIG_INET_LRO is not set
+ # CONFIG_IPV6 is not set
++CONFIG_MTD=y
+ CONFIG_PROC_DEVICETREE=y
+ CONFIG_BLK_DEV_RAM=y
+ CONFIG_BLK_DEV_RAM_SIZE=8192
+ CONFIG_NETDEVICES=y
+-CONFIG_NET_ETHERNET=y
+ CONFIG_XILINX_EMACLITE=y
++CONFIG_XILINX_LL_TEMAC=y
+ # CONFIG_INPUT is not set
+ # CONFIG_SERIO is not set
+ # CONFIG_VT is not set
++CONFIG_SERIAL_8250=y
++CONFIG_SERIAL_8250_CONSOLE=y
+ CONFIG_SERIAL_UARTLITE=y
+ CONFIG_SERIAL_UARTLITE_CONSOLE=y
+ # CONFIG_HW_RANDOM is not set
++CONFIG_XILINX_HWICAP=y
++CONFIG_I2C=y
++CONFIG_I2C_XILINX=y
++CONFIG_SPI=y
++CONFIG_SPI_XILINX=y
++CONFIG_GPIOLIB=y
++CONFIG_GPIO_SYSFS=y
++CONFIG_GPIO_XILINX=y
+ # CONFIG_HWMON is not set
++CONFIG_WATCHDOG=y
++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
++CONFIG_ROMFS_FS=y
+ CONFIG_NFS_FS=y
+-CONFIG_NFS_V3=y
+ CONFIG_CIFS=y
+ CONFIG_CIFS_STATS=y
+ CONFIG_CIFS_STATS2=y
+-CONFIG_PARTITION_ADVANCED=y
+-CONFIG_DEBUG_KERNEL=y
+ CONFIG_DETECT_HUNG_TASK=y
+ CONFIG_DEBUG_SLAB=y
+ CONFIG_DEBUG_SPINLOCK=y
+ CONFIG_DEBUG_INFO=y
+-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+ CONFIG_EARLY_PRINTK=y
++CONFIG_KEYS=y
++CONFIG_ENCRYPTED_KEYS=y
++CONFIG_KEYS_DEBUG_PROC_KEYS=y
+ # CONFIG_CRYPTO_ANSI_CPRNG is not set
+--- a/arch/microblaze/configs/nommu_defconfig
++++ b/arch/microblaze/configs/nommu_defconfig
+@@ -1,41 +1,40 @@
+ 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
+ CONFIG_IKCONFIG_PROC=y
++CONFIG_SYSFS_DEPRECATED=y
+ CONFIG_SYSFS_DEPRECATED_V2=y
+-CONFIG_EXPERT=y
+ CONFIG_KALLSYMS_ALL=y
+-CONFIG_KALLSYMS_EXTRA_PASS=y
+-# CONFIG_HOTPLUG is not set
+ # CONFIG_BASE_FULL is not set
++CONFIG_EMBEDDED=y
+ CONFIG_SLAB=y
+ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+ # CONFIG_BLK_DEV_BSG is not set
+-# CONFIG_OPT_LIB_FUNCTION is not set
++CONFIG_PARTITION_ADVANCED=y
++# CONFIG_EFI_PARTITION is not set
+ CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
+ CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
+ CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
+ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
+ CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
+ CONFIG_XILINX_MICROBLAZE0_USE_FPU=2
+-CONFIG_HIGH_RES_TIMERS=y
+ CONFIG_HZ_100=y
+ CONFIG_CMDLINE_BOOL=y
+-CONFIG_BINFMT_FLAT=y
++CONFIG_CMDLINE_FORCE=y
+ CONFIG_NET=y
+ CONFIG_PACKET=y
+ CONFIG_UNIX=y
+ CONFIG_INET=y
+ # CONFIG_INET_LRO is not set
+ # CONFIG_IPV6 is not set
+-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+ CONFIG_MTD=y
+-CONFIG_MTD_CONCAT=y
+-CONFIG_MTD_PARTITIONS=y
+ CONFIG_MTD_CMDLINE_PARTS=y
+ CONFIG_MTD_CHAR=y
+ CONFIG_MTD_BLOCK=y
+@@ -45,41 +44,55 @@ CONFIG_MTD_CFI_AMDSTD=y
+ CONFIG_MTD_RAM=y
+ CONFIG_MTD_UCLINUX=y
+ CONFIG_PROC_DEVICETREE=y
+-CONFIG_BLK_DEV_NBD=y
+ CONFIG_BLK_DEV_RAM=y
++CONFIG_BLK_DEV_RAM_SIZE=8192
+ CONFIG_NETDEVICES=y
+-CONFIG_NET_ETHERNET=y
++CONFIG_XILINX_EMACLITE=y
++CONFIG_XILINX_LL_TEMAC=y
+ # CONFIG_INPUT is not set
+ # CONFIG_SERIO is not set
+ # CONFIG_VT is not set
++CONFIG_SERIAL_8250=y
++CONFIG_SERIAL_8250_CONSOLE=y
+ CONFIG_SERIAL_UARTLITE=y
+ CONFIG_SERIAL_UARTLITE_CONSOLE=y
+-CONFIG_HW_RANDOM=y
++# CONFIG_HW_RANDOM is not set
++CONFIG_XILINX_HWICAP=y
++CONFIG_I2C=y
++CONFIG_I2C_XILINX=y
++CONFIG_SPI=y
++CONFIG_SPI_XILINX=y
++CONFIG_GPIOLIB=y
++CONFIG_GPIO_SYSFS=y
++CONFIG_GPIO_XILINX=y
+ # CONFIG_HWMON is not set
+-CONFIG_VIDEO_OUTPUT_CONTROL=y
++CONFIG_WATCHDOG=y
++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
+ CONFIG_ROMFS_FS=y
+ CONFIG_NFS_FS=y
+-CONFIG_NFS_V3=y
+ CONFIG_NFS_V3_ACL=y
+-CONFIG_UNUSED_SYMBOLS=y
+-CONFIG_DEBUG_FS=y
+-CONFIG_DEBUG_KERNEL=y
+-CONFIG_DEBUG_SHIRQ=y
++CONFIG_NLS=y
+ CONFIG_DETECT_HUNG_TASK=y
+-CONFIG_SCHEDSTATS=y
+-CONFIG_TIMER_STATS=y
+-CONFIG_DEBUG_OBJECTS=y
+-CONFIG_DEBUG_OBJECTS_SELFTEST=y
+-CONFIG_DEBUG_OBJECTS_FREE=y
+-CONFIG_DEBUG_OBJECTS_TIMERS=y
++CONFIG_DEBUG_SLAB=y
++CONFIG_DEBUG_SPINLOCK=y
+ CONFIG_DEBUG_INFO=y
+-CONFIG_DEBUG_LIST=y
+-CONFIG_DEBUG_SG=y
+-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+-CONFIG_SYSCTL_SYSCALL_CHECK=y
+ CONFIG_EARLY_PRINTK=y
++CONFIG_KEYS=y
++CONFIG_ENCRYPTED_KEYS=y
++CONFIG_KEYS_DEBUG_PROC_KEYS=y
++CONFIG_CRYPTO_ECB=y
++CONFIG_CRYPTO_MD4=y
++CONFIG_CRYPTO_MD5=y
++CONFIG_CRYPTO_ARC4=y
++CONFIG_CRYPTO_DES=y
+ # CONFIG_CRYPTO_ANSI_CPRNG is not set
+-# CONFIG_CRC32 is not set
--- /dev/null
+From 78857614104a26cdada4c53eea104752042bf5a1 Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Mon, 17 Jun 2013 08:09:00 +0000
+Subject: MIPS: Expose missing pci_io{map,unmap} declarations
+
+From: Markos Chandras <markos.chandras@imgtec.com>
+
+commit 78857614104a26cdada4c53eea104752042bf5a1 upstream.
+
+The GENERIC_PCI_IOMAP does not depend on CONFIG_PCI so move
+it to the CONFIG_MIPS symbol so it's always selected for MIPS.
+This fixes the missing pci_iomap declaration for MIPS.
+Moreover, the pci_iounmap function was not defined in the
+io.h header file if the CONFIG_PCI symbol is not set,
+but it should since MIPS is not using CONFIG_GENERIC_IOMAP.
+
+This fixes the following problem on a allyesconfig:
+
+drivers/net/ethernet/3com/3c59x.c:1031:2: error: implicit declaration of
+function 'pci_iomap' [-Werror=implicit-function-declaration]
+drivers/net/ethernet/3com/3c59x.c:1044:3: error: implicit declaration of
+function 'pci_iounmap' [-Werror=implicit-function-declaration]
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/5478/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/Kconfig | 2 +-
+ arch/mips/include/asm/io.h | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -24,6 +24,7 @@ config MIPS
+ select HAVE_GENERIC_HARDIRQS
+ select GENERIC_IRQ_PROBE
+ select GENERIC_IRQ_SHOW
++ select GENERIC_PCI_IOMAP
+ select HAVE_ARCH_JUMP_LABEL
+ select IRQ_FORCED_THREADING
+ select HAVE_MEMBLOCK
+@@ -2356,7 +2357,6 @@ config PCI
+ bool "Support for PCI controller"
+ depends on HW_HAS_PCI
+ select PCI_DOMAINS
+- select GENERIC_PCI_IOMAP
+ select NO_GENERIC_PCI_IOPORT_MAP
+ help
+ Find out whether you have a PCI motherboard. PCI is the name of a
+--- a/arch/mips/include/asm/io.h
++++ b/arch/mips/include/asm/io.h
+@@ -168,6 +168,11 @@ static inline void * isa_bus_to_virt(uns
+ extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags);
+ extern void __iounmap(const volatile void __iomem *addr);
+
++#ifndef CONFIG_PCI
++struct pci_dev;
++static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
++#endif
++
+ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
+ unsigned long flags)
+ {
--- /dev/null
+From 8b9232141bf40788cce31f893c13f344ec31ee66 Mon Sep 17 00:00:00 2001
+From: Ralf Baechle <ralf@linux-mips.org>
+Date: Sat, 18 May 2013 17:02:59 +0200
+Subject: MIPS: Rewrite pfn_valid to work in modules, too.
+
+From: Ralf Baechle <ralf@linux-mips.org>
+
+commit 8b9232141bf40788cce31f893c13f344ec31ee66 upstream.
+
+This fixes:
+
+ MODPOST 393 modules
+ERROR: "min_low_pfn" [arch/mips/kvm/kvm.ko] undefined!
+make[3]: *** [__modpost] Error 1
+
+It would have been possible to just export min_low_pfn but in the end
+pfn_valid should return 1 for any pfn argument for which a struct page
+exists so using min_low_pfn was wrong anyway.
+
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/include/asm/page.h | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+--- a/arch/mips/include/asm/page.h
++++ b/arch/mips/include/asm/page.h
+@@ -175,14 +175,13 @@ typedef struct { unsigned long pgprot; }
+
+ #ifdef CONFIG_FLATMEM
+
+-#define pfn_valid(pfn) \
+-({ \
+- unsigned long __pfn = (pfn); \
+- /* avoid <linux/bootmem.h> include hell */ \
+- extern unsigned long min_low_pfn; \
+- \
+- __pfn >= min_low_pfn && __pfn < max_mapnr; \
+-})
++static inline int pfn_valid(unsigned long pfn)
++{
++ /* avoid <linux/mm.h> include hell */
++ extern unsigned long max_mapnr;
++
++ return pfn >= ARCH_PFN_OFFSET && pfn < max_mapnr;
++}
+
+ #elif defined(CONFIG_SPARSEMEM)
+
--- /dev/null
+From b88a2595b6d8aedbd275c07dfa784657b4f757eb Mon Sep 17 00:00:00 2001
+From: Stephen Boyd <sboyd@codeaurora.org>
+Date: Wed, 7 Aug 2013 16:18:08 -0700
+Subject: perf/arm: Fix armpmu_map_hw_event()
+
+From: Stephen Boyd <sboyd@codeaurora.org>
+
+commit b88a2595b6d8aedbd275c07dfa784657b4f757eb upstream.
+
+Fix constraint check in armpmu_map_hw_event().
+
+Reported-and-tested-by: Vince Weaver <vincent.weaver@maine.edu>
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/kernel/perf_event.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/kernel/perf_event.c
++++ b/arch/arm/kernel/perf_event.c
+@@ -109,7 +109,12 @@ armpmu_map_cache_event(const unsigned (*
+ static int
+ armpmu_map_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config)
+ {
+- int mapping = (*event_map)[config];
++ int mapping;
++
++ if (config >= PERF_COUNT_HW_MAX)
++ return -ENOENT;
++
++ mapping = (*event_map)[config];
+ return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping;
+ }
+
--- /dev/null
+perf-arm-fix-armpmu_map_hw_event.patch
+fs-proc-task_mmu.c-fix-buffer-overflow-in-add_page_map.patch
+drm-i915-lvds-ditch-prepare-special-case.patch
+mips-expose-missing-pci_io-map-unmap-declarations.patch
+microblaze-update-microblaze-defconfigs.patch
+sound-fix-make-allmodconfig-on-mips.patch
+sound-fix-make-allmodconfig-on-mips-correctly.patch
+mips-rewrite-pfn_valid-to-work-in-modules-too.patch
+hid-microsoft-do-not-use-compound-literal-fix-build.patch
+vm-add-no-mmu-vm_iomap_memory-stub.patch
+cris-posix_types.h-include-asm-generic-posix_types.h.patch
+cris-remove-old-legacy-traditional-flag-from-arch-v10-lib-makefile.patch
+cris-add-_sdata-to-vmlinux.lds.s.patch
--- /dev/null
+From a62ee234a572b4c98fe98cf5fb18e4e8b0f6e43d Mon Sep 17 00:00:00 2001
+From: Paul Bolle <pebolle@tiscali.nl>
+Date: Sun, 12 May 2013 14:31:19 +0200
+Subject: sound: Fix make allmodconfig on MIPS correctly
+
+From: Paul Bolle <pebolle@tiscali.nl>
+
+commit a62ee234a572b4c98fe98cf5fb18e4e8b0f6e43d upstream.
+
+Commit d4702b189c ("sound: Fix make allmodconfig on MIPS") added a
+(negative) dependency on ISA_DMA_SUPPORT_BROKEN. Since that Kconfig
+symbol doesn't exist, this dependency will always evaluate to true.
+Apparently GENERIC_ISA_DMA_SUPPORT_BROKEN was meant to be used here.
+
+Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/oss/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/oss/Kconfig
++++ b/sound/oss/Kconfig
+@@ -250,7 +250,7 @@ config MSND_FIFOSIZE
+ menuconfig SOUND_OSS
+ tristate "OSS sound modules"
+ depends on ISA_DMA_API && VIRT_TO_BUS
+- depends on !ISA_DMA_SUPPORT_BROKEN
++ depends on !GENERIC_ISA_DMA_SUPPORT_BROKEN
+ help
+ OSS is the Open Sound System suite of sound card drivers. They make
+ sound programming easier since they provide a common API. Say Y or
--- /dev/null
+From d4702b189c6b951c1cb3260036ff998f719bfb62 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 3 May 2013 17:07:24 +0200
+Subject: sound: Fix make allmodconfig on MIPS
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit d4702b189c6b951c1cb3260036ff998f719bfb62 upstream.
+
+The compile of soundcard.c is broken on MIPS when allmodconfig is used
+because of the missing MAX_DMA_CHANNELS definition. As a simple
+workaround, just add a Kconfig dependency.
+
+Reported-by: Andrew Morton <akpm@linux-foundation.org>
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/oss/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/oss/Kconfig
++++ b/sound/oss/Kconfig
+@@ -250,6 +250,7 @@ config MSND_FIFOSIZE
+ menuconfig SOUND_OSS
+ tristate "OSS sound modules"
+ depends on ISA_DMA_API && VIRT_TO_BUS
++ depends on !ISA_DMA_SUPPORT_BROKEN
+ help
+ OSS is the Open Sound System suite of sound card drivers. They make
+ sound programming easier since they provide a common API. Say Y or
--- /dev/null
+From 3c0b9de6d37a481673e81001c57ca0e410c72346 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Sat, 27 Apr 2013 13:25:38 -0700
+Subject: vm: add no-mmu vm_iomap_memory() stub
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 3c0b9de6d37a481673e81001c57ca0e410c72346 upstream.
+
+I think we could just move the full vm_iomap_memory() function into
+util.h or similar, but I didn't get any reply from anybody actually
+using nommu even to this trivial patch, so I'm not going to touch it any
+more than required.
+
+Here's the fairly minimal stub to make the nommu case at least
+potentially work. It doesn't seem like anybody cares, though.
+
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Geert Uytterhoeven <geert@linux-m68k.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/nommu.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/mm/nommu.c
++++ b/mm/nommu.c
+@@ -1856,6 +1856,16 @@ int remap_pfn_range(struct vm_area_struc
+ }
+ EXPORT_SYMBOL(remap_pfn_range);
+
++int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len)
++{
++ unsigned long pfn = start >> PAGE_SHIFT;
++ unsigned long vm_len = vma->vm_end - vma->vm_start;
++
++ pfn += vma->vm_pgoff;
++ return io_remap_pfn_range(vma, vma->vm_start, pfn, vm_len, vma->vm_page_prot);
++}
++EXPORT_SYMBOL(vm_iomap_memory);
++
+ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
+ unsigned long pgoff)
+ {
projects / thirdparty / kernel / stable-queue.git / commitdiff
