3 files changed, 48 insertions, 23 deletions

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index d6c379dc64fa..9cca3785cab8 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -141,6 +141,8 @@ extern int __gpio_to_irq(unsigned gpio);
  * but more typically is configured entirely from userspace.
  */
 extern int gpio_export(unsigned gpio, bool direction_may_change);
+extern int gpio_export_link(struct device *dev, const char *name,
+                        unsigned gpio);
 extern void gpio_unexport(unsigned gpio);
 
 #endif  /* CONFIG_GPIO_SYSFS */
@@ -185,6 +187,12 @@ static inline int gpio_export(unsigned gpio, bool direction_may_change)
         return -ENOSYS;
 }
 
+static inline int gpio_export_link(struct device *dev, const char *name,
+                                unsigned gpio)
+{
+        return -ENOSYS;
+}
+
 static inline void gpio_unexport(unsigned gpio)
 {
 }
diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
index eddbce0f9fb9..e5f234a08540 100644
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
@@ -2,34 +2,35 @@
 #define _ASM_GENERIC_KMAP_TYPES_H
 
 #ifdef __WITH_KM_FENCE
-# define D(n) __KM_FENCE_##n ,
+# define KMAP_D(n) __KM_FENCE_##n ,
 #else
-# define D(n)
+# define KMAP_D(n)
 #endif
 
 enum km_type {
-D(0)    KM_BOUNCE_READ,
-D(1)    KM_SKB_SUNRPC_DATA,
-D(2)    KM_SKB_DATA_SOFTIRQ,
-D(3)    KM_USER0,
-D(4)    KM_USER1,
-D(5)    KM_BIO_SRC_IRQ,
-D(6)    KM_BIO_DST_IRQ,
-D(7)    KM_PTE0,
-D(8)    KM_PTE1,
-D(9)    KM_IRQ0,
-D(10)   KM_IRQ1,
-D(11)   KM_SOFTIRQ0,
-D(12)   KM_SOFTIRQ1,
-D(13)   KM_SYNC_ICACHE,
-D(14)   KM_SYNC_DCACHE,
-D(15)   KM_UML_USERCOPY, /* UML specific, for copy_*_user - used in do_op_one_page */
-D(16)   KM_IRQ_PTE,
-D(17)   KM_NMI,
-D(18)   KM_NMI_PTE,
-D(19)   KM_TYPE_NR
+KMAP_D(0)       KM_BOUNCE_READ,
+KMAP_D(1)       KM_SKB_SUNRPC_DATA,
+KMAP_D(2)       KM_SKB_DATA_SOFTIRQ,
+KMAP_D(3)       KM_USER0,
+KMAP_D(4)       KM_USER1,
+KMAP_D(5)       KM_BIO_SRC_IRQ,
+KMAP_D(6)       KM_BIO_DST_IRQ,
+KMAP_D(7)       KM_PTE0,
+KMAP_D(8)       KM_PTE1,
+KMAP_D(9)       KM_IRQ0,
+KMAP_D(10)      KM_IRQ1,
+KMAP_D(11)      KM_SOFTIRQ0,
+KMAP_D(12)      KM_SOFTIRQ1,
+KMAP_D(13)      KM_SYNC_ICACHE,
+KMAP_D(14)      KM_SYNC_DCACHE,
+/* UML specific, for copy_*_user - used in do_op_one_page */
+KMAP_D(15)      KM_UML_USERCOPY,
+KMAP_D(16)      KM_IRQ_PTE,
+KMAP_D(17)      KM_NMI,
+KMAP_D(18)      KM_NMI_PTE,
+KMAP_D(19)      KM_TYPE_NR
 };
 
-#undef D
+#undef KMAP_D
 
 #endif
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index d083561337f2..b3bfabc258f3 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -23,4 +23,20 @@ extern char __ctors_start[], __ctors_end[];
 #define dereference_function_descriptor(p) (p)
 #endif
 
+/* random extra sections (if any).  Override
+ * in asm/sections.h */
+#ifndef arch_is_kernel_text
+static inline int arch_is_kernel_text(unsigned long addr)
+{
+        return 0;
+}
+#endif
+
+#ifndef arch_is_kernel_data
+static inline int arch_is_kernel_data(unsigned long addr)
+{
+        return 0;
+}
+#endif
+
 #endif /* _ASM_GENERIC_SECTIONS_H_ */