Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

4 files changed, 47 insertions, 58 deletions

diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index 75d59fcd48b8..c11212ff3510 100644
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -15,8 +15,8 @@ endef
 quiet_cmd_offsets = GEN     $@
 define cmd_offsets
         (set -e; \
-         echo "#ifndef __DEVICEVTABLE_OFFSETS_H__"; \
-         echo "#define __DEVICEVTABLE_OFFSETS_H__"; \
+         echo "#ifndef __DEVICETABLE_OFFSETS_H__"; \
+         echo "#define __DEVICETABLE_OFFSETS_H__"; \
          echo "/*"; \
          echo " * DO NOT MODIFY."; \
          echo " *"; \
@@ -29,15 +29,10 @@ define cmd_offsets
          echo "#endif" ) > $@
 endef
 
-# We use internal kbuild rules to avoid the "is up to date" message from make
-scripts/mod/devicetable-offsets.s: scripts/mod/devicetable-offsets.c FORCE
-        $(Q)mkdir -p $(dir $@)
-        $(call if_changed_dep,cc_s_c)
+$(obj)/$(devicetable-offsets-file): $(obj)/devicetable-offsets.s
+        $(call if_changed,offsets)
 
-$(obj)/$(devicetable-offsets-file): scripts/mod/devicetable-offsets.s
-        $(call cmd,offsets)
-
-targets += $(devicetable-offsets-file)
+targets += $(devicetable-offsets-file) devicetable-offsets.s
 
 # dependencies on generated files need to be listed explicitly
 
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index e66d4d258e1a..bb5d115ca671 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -177,5 +177,11 @@ int main(void)
         DEVID(mei_cl_device_id);
         DEVID_FIELD(mei_cl_device_id, name);
 
+        DEVID(rio_device_id);
+        DEVID_FIELD(rio_device_id, did);
+        DEVID_FIELD(rio_device_id, vid);
+        DEVID_FIELD(rio_device_id, asm_did);
+        DEVID_FIELD(rio_device_id, asm_vid);
+
         return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 45f9a3377dcd..23708636b05c 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -79,10 +79,12 @@ struct devtable **__start___devtable, **__stop___devtable;
 extern struct devtable *__start___devtable[], *__stop___devtable[];
 #endif /* __MACH__ */
 
-#if __GNUC__ == 3 && __GNUC_MINOR__ < 3
-# define __used                 __attribute__((__unused__))
-#else
-# define __used                 __attribute__((__used__))
+#if !defined(__used)
+# if __GNUC__ == 3 && __GNUC_MINOR__ < 3
+#  define __used                        __attribute__((__unused__))
+# else
+#  define __used                        __attribute__((__used__))
+# endif
 #endif
 
 /* Define a variable f that holds the value of field f of struct devid
@@ -1145,6 +1147,26 @@ static int do_mei_entry(const char *filename, void *symval,
 }
 ADD_TO_DEVTABLE("mei", mei_cl_device_id, do_mei_entry);
 
+/* Looks like: rapidio:vNdNavNadN */
+static int do_rio_entry(const char *filename,
+                        void *symval, char *alias)
+{
+        DEF_FIELD(symval, rio_device_id, did);
+        DEF_FIELD(symval, rio_device_id, vid);
+        DEF_FIELD(symval, rio_device_id, asm_did);
+        DEF_FIELD(symval, rio_device_id, asm_vid);
+
+        strcpy(alias, "rapidio:");
+        ADD(alias, "v", vid != RIO_ANY_ID, vid);
+        ADD(alias, "d", did != RIO_ANY_ID, did);
+        ADD(alias, "av", asm_vid != RIO_ANY_ID, asm_vid);
+        ADD(alias, "ad", asm_did != RIO_ANY_ID, asm_did);
+
+        add_wildcard(alias);
+        return 1;
+}
+ADD_TO_DEVTABLE("rapidio", rio_device_id, do_rio_entry);
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index a4be8e112bb6..62164348ecf7 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -861,37 +861,34 @@ static void check_section(const char *modname, struct elf_info *elf,
 
 
 #define ALL_INIT_DATA_SECTIONS \
-        ".init.setup$", ".init.rodata$", \
-        ".cpuinit.rodata$", ".meminit.rodata$", \
-        ".init.data$", ".cpuinit.data$", ".meminit.data$"
+        ".init.setup$", ".init.rodata$", ".meminit.rodata$", \
+        ".init.data$", ".meminit.data$"
 #define ALL_EXIT_DATA_SECTIONS \
-        ".exit.data$", ".cpuexit.data$", ".memexit.data$"
+        ".exit.data$", ".memexit.data$"
 
 #define ALL_INIT_TEXT_SECTIONS \
-        ".init.text$", ".cpuinit.text$", ".meminit.text$"
+        ".init.text$", ".meminit.text$"
 #define ALL_EXIT_TEXT_SECTIONS \
-        ".exit.text$", ".cpuexit.text$", ".memexit.text$"
+        ".exit.text$", ".memexit.text$"
 
 #define ALL_PCI_INIT_SECTIONS   \
         ".pci_fixup_early$", ".pci_fixup_header$", ".pci_fixup_final$", \
         ".pci_fixup_enable$", ".pci_fixup_resume$", \
         ".pci_fixup_resume_early$", ".pci_fixup_suspend$"
 
-#define ALL_XXXINIT_SECTIONS CPU_INIT_SECTIONS, MEM_INIT_SECTIONS
-#define ALL_XXXEXIT_SECTIONS CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS
+#define ALL_XXXINIT_SECTIONS MEM_INIT_SECTIONS
+#define ALL_XXXEXIT_SECTIONS MEM_EXIT_SECTIONS
 
 #define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
 #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
 
 #define DATA_SECTIONS ".data$", ".data.rel$"
-#define TEXT_SECTIONS ".text$"
+#define TEXT_SECTIONS ".text$", ".text.unlikely$"
 
 #define INIT_SECTIONS      ".init.*"
-#define CPU_INIT_SECTIONS  ".cpuinit.*"
 #define MEM_INIT_SECTIONS  ".meminit.*"
 
 #define EXIT_SECTIONS      ".exit.*"
-#define CPU_EXIT_SECTIONS  ".cpuexit.*"
 #define MEM_EXIT_SECTIONS  ".memexit.*"
 
 /* init data sections */
@@ -979,48 +976,20 @@ const struct sectioncheck sectioncheck[] = {
         .mismatch = DATA_TO_ANY_EXIT,
         .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
-/* Do not reference init code/data from cpuinit/meminit code/data */
+/* Do not reference init code/data from meminit code/data */
 {
         .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
         .tosec   = { INIT_SECTIONS, NULL },
         .mismatch = XXXINIT_TO_SOME_INIT,
         .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
-/* Do not reference cpuinit code/data from meminit code/data */
-{
-        .fromsec = { MEM_INIT_SECTIONS, NULL },
-        .tosec   = { CPU_INIT_SECTIONS, NULL },
-        .mismatch = XXXINIT_TO_SOME_INIT,
-        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
-/* Do not reference meminit code/data from cpuinit code/data */
-{
-        .fromsec = { CPU_INIT_SECTIONS, NULL },
-        .tosec   = { MEM_INIT_SECTIONS, NULL },
-        .mismatch = XXXINIT_TO_SOME_INIT,
-        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
-/* Do not reference exit code/data from cpuexit/memexit code/data */
+/* Do not reference exit code/data from memexit code/data */
 {
         .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
         .tosec   = { EXIT_SECTIONS, NULL },
         .mismatch = XXXEXIT_TO_SOME_EXIT,
         .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
-/* Do not reference cpuexit code/data from memexit code/data */
-{
-        .fromsec = { MEM_EXIT_SECTIONS, NULL },
-        .tosec   = { CPU_EXIT_SECTIONS, NULL },
-        .mismatch = XXXEXIT_TO_SOME_EXIT,
-        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
-/* Do not reference memexit code/data from cpuexit code/data */
-{
-        .fromsec = { CPU_EXIT_SECTIONS, NULL },
-        .tosec   = { MEM_EXIT_SECTIONS, NULL },
-        .mismatch = XXXEXIT_TO_SOME_EXIT,
-        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
 /* Do not use exit code/data from init code */
 {
         .fromsec = { ALL_INIT_SECTIONS, NULL },
@@ -1089,8 +1058,6 @@ static const struct sectioncheck *section_mismatch(
  * Pattern 2:
  *   Many drivers utilise a *driver container with references to
  *   add, remove, probe functions etc.
- *   These functions may often be marked __cpuinit and we do not want to
- *   warn here.
  *   the pattern is identified by:
  *   tosec   = init or exit section
  *   fromsec = data section
@@ -1249,7 +1216,6 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
 /*
  * Convert a section name to the function/data attribute
  * .init.text => __init
- * .cpuinit.data => __cpudata
  * .memexitconst => __memconst
  * etc.
  *