- try fixing 'undefined reference to pnp_bios_callpoint' error on i686

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 392d1212b54690cc4ea01e399c80095dce704114..475b02db71518b9c0feafc6ccdf212999629da7c 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -46,3 +46,104 @@ index 7a0c800..ec5ebbb 100644
        SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
        dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
  
+[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
+
+If a device has the skip_vpd_pages flag set we should simply fail the
+scsi_get_vpd_page() call.
+
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Tested-by: Stuart Foster <smf.linux@ntlworld.com>
+Cc: stable@vger.kernel.org
+
+diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
+index 3b1ea34..eaa808e 100644
+--- a/drivers/scsi/scsi.c
++++ b/drivers/scsi/scsi.c
+@@ -1031,6 +1031,9 @@
+ {
+       int i, result;
+ 
++      if (sdev->skip_vpd_pages)
++          goto fail;
++
+       /* Ask for all the pages supported by this device */
+       result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
+       if (result)
+
+From 1e2ee49f7f1b79f0b14884fe6a602f0411b39552 Mon Sep 17 00:00:00 2001
+From: Will Woods <wwoods@redhat.com>
+Date: Tue, 6 May 2014 12:50:10 -0700
+Subject: fanotify: fix -EOVERFLOW with large files on 64-bit
+
+On 64-bit systems, O_LARGEFILE is automatically added to flags inside
+the open() syscall (also openat(), blkdev_open(), etc).  Userspace
+therefore defines O_LARGEFILE to be 0 - you can use it, but it's a
+no-op.  Everything should be O_LARGEFILE by default.
+
+But: when fanotify does create_fd() it uses dentry_open(), which skips
+all that.  And userspace can't set O_LARGEFILE in fanotify_init()
+because it's defined to 0.  So if fanotify gets an event regarding a
+large file, the read() will just fail with -EOVERFLOW.
+
+This patch adds O_LARGEFILE to fanotify_init()'s event_f_flags on 64-bit
+systems, using the same test as open()/openat()/etc.
+
+Addresses https://bugzilla.redhat.com/show_bug.cgi?id=696821
+
+Signed-off-by: Will Woods <wwoods@redhat.com>
+Acked-by: Eric Paris <eparis@redhat.com>
+Reviewed-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+
+diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
+index 4e565c8..732648b 100644
+--- a/fs/notify/fanotify/fanotify_user.c
++++ b/fs/notify/fanotify/fanotify_user.c
+@@ -698,6 +698,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags)
+       }
+       group->overflow_event = &oevent->fse;
+ 
++      if (force_o_largefile())
++              event_f_flags |= O_LARGEFILE;
+       group->fanotify_data.f_flags = event_f_flags;
+ #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
+       spin_lock_init(&group->fanotify_data.access_lock);
+--- a/drivers/pnp/pnpbios/bioscalls.c  2014-03-31 05:40:15.000000000 +0200
++++ b/drivers/pnp/pnpbios/bioscalls.c  2015-08-30 20:34:09.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include "pnpbios.h"
+ 
+-static struct {
++__visible struct {
+       u16 offset;
+       u16 segment;
+ } pnp_bios_callpoint;
+@@ -37,10 +37,11 @@
+  * kernel begins at offset 3GB...
+  */
+ 
+-asmlinkage void pnp_bios_callfunc(void);
++asmlinkage __visible void pnp_bios_callfunc(void);
+ 
+ __asm__(".text                        \n"
+       __ALIGN_STR "\n"
++      ".globl pnp_bios_callfunc\n"
+       "pnp_bios_callfunc:\n"
+       "       pushl %edx      \n"
+       "       pushl %ecx      \n"
+@@ -66,9 +67,9 @@
+  * after PnP BIOS oopses.
+  */
+ 
+-u32 pnp_bios_fault_esp;
+-u32 pnp_bios_fault_eip;
+-u32 pnp_bios_is_utter_crap = 0;
++__visible u32 pnp_bios_fault_esp;
++__visible u32 pnp_bios_fault_eip;
++__visible u32 pnp_bios_is_utter_crap = 0;
+ 
+ static spinlock_t pnp_bios_lock;
+