Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (23 commits)
  [PATCH] sysfs: fix a kobject leak in sysfs_add_link on the error path
  [PATCH] sysfs: don't export dir symbols
  [PATCH] get_cpu_sysdev() signedness fix
  [PATCH] kobject_add_dir
  [PATCH] debugfs: Add debugfs_create_blob() helper for exporting binary data
  [PATCH] sysfs: fix problem with duplicate sysfs directories and files
  [PATCH] Kobject: kobject.h: fix a typo
  [PATCH] Kobject: provide better warning messages when people do stupid things
  [PATCH] Driver core: add macros notice(), dev_notice()
  [PATCH] firmware: fix BUG: in fw_realloc_buffer
  [PATCH] sysfs: kzalloc conversion
  [PATCH] fix module sysfs files reference counting
  [PATCH] add EXPORT_SYMBOL_GPL_FUTURE() to USB subsystem
  [PATCH] add EXPORT_SYMBOL_GPL_FUTURE() to RCU subsystem
  [PATCH] add EXPORT_SYMBOL_GPL_FUTURE()
  [PATCH] Clean up module.c symbol searching logic
  [PATCH] kobj_map semaphore to mutex conversion
  [PATCH] kref: avoid an atomic operation in kref_put()
  [PATCH] handle errors returned by platform_get_irq*()
  [PATCH] driver core: platform_get_irq*(): return -ENXIO on error
  ...

4 files changed, 22 insertions, 0 deletions

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index d31b1cb7eea0..23609400a8e2 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -788,6 +788,8 @@ static int locomo_probe(struct platform_device *dev)
         if (!mem)
                 return -EINVAL;
         irq = platform_get_irq(dev, 0);
+        if (irq < 0)
+                return -ENXIO;
 
         return __locomo_probe(&dev->dev, mem, irq);
 }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 1475089f9b42..93352f6097c1 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -943,6 +943,8 @@ static int sa1111_probe(struct platform_device *pdev)
         if (!mem)
                 return -EINVAL;
         irq = platform_get_irq(pdev, 0);
+        if (irq < 0)
+                return -ENXIO;
 
         return __sa1111_probe(&pdev->dev, mem, irq);
 }
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index ac9de2661c0b..a331cc90797c 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -269,6 +269,11 @@ SECTIONS {
                 *(__ksymtab_gpl)
                 __stop___ksymtab_gpl = .;
 
+                /* Kernel symbol table: GPL-future symbols */
+                __start___ksymtab_gpl_future = .;
+                *(__ksymtab_gpl_future)
+                __stop___ksymtab_gpl_future = .;
+
                 /* Kernel symbol table: Normal symbols */
                 __start___kcrctab = .;
                 *(__kcrctab)
@@ -279,6 +284,11 @@ SECTIONS {
                 *(__kcrctab_gpl)
                 __stop___kcrctab_gpl = .;
 
+                /* Kernel symbol table: GPL-future symbols */
+                __start___kcrctab_gpl_future = .;
+                *(__kcrctab_gpl_future)
+                __stop___kcrctab_gpl_future = .;
+
                 /* Kernel symbol table: strings */
                 *(__ksymtab_strings)
 
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index 5be05f47109e..5b2ffcc6e2b2 100644
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -64,6 +64,10 @@
                 ___start___ksymtab_gpl = .;                                   \
                         *(__ksymtab_gpl)                                      \
                 ___stop___ksymtab_gpl = .;                                    \
+                /* Kernel symbol table: GPL-future symbols */                 \
+                ___start___ksymtab_gpl_future = .;                            \
+                        *(__ksymtab_gpl_future)                               \
+                ___stop___ksymtab_gpl_future = .;                             \
                 /* Kernel symbol table: strings */                            \
                         *(__ksymtab_strings)                                  \
                 /* Kernel symbol table: Normal symbols */                     \
@@ -74,6 +78,10 @@
                 ___start___kcrctab_gpl = .;                                   \
                         *(__kcrctab_gpl)                                      \
                 ___stop___kcrctab_gpl = .;                                    \
+                /* Kernel symbol table: GPL-future symbols */                 \
+                ___start___kcrctab_gpl_future = .;                            \
+                        *(__kcrctab_gpl_future)                               \
+                ___stop___kcrctab_gpl_future = .;                             \
                 /* Built-in module parameters */                              \
                 . = ALIGN (4) ;                                               \
                 ___start___param = .;                                         \