kbuild: move bounds.h to include/generated

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Michal Marek <mmarek@suse.cz>

diff --git a/.gitignore b/.gitignore
index 946c7ec5c922ff5bb02726144178f56f57c3378d..36d9cd6d42819178c62710a2a66949550b852bde 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 include/linux/utsrelease.h
-include/linux/bounds.h
 include/generated
 
 # stgit generated dirs

diff --git a/Kbuild b/Kbuild
index f056b4feee519748ae6ef22fde3df1da532e177b..1165d7a5ca4a9d04886dbdad604f6e57bded974b 100644 (file)
--- a/Kbuild
+++ b/Kbuild
@@ -8,7 +8,7 @@
 #####
 # 1) Generate bounds.h
 
-bounds-file := include/linux/bounds.h
+bounds-file := include/generated/bounds.h
 
 always  := $(bounds-file)
 targets := $(bounds-file) kernel/bounds.s

diff --git a/Makefile b/Makefile
index 07711786dc952da1750c50b5fff6a08c1aad44c9..b58e9312ce30ce8e66c363461c39d0a61101a886 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1197,7 +1197,7 @@ MRPROPER_DIRS  += include/config include2 usr/include include/generated
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/linux/autoconf.h include/linux/version.h      \
                   include/linux/utsrelease.h                            \
-                  include/linux/bounds.h include/asm*/asm-offsets.h     \
+                  include/asm*/asm-offsets.h                            \
                  Module.symvers Module.markers tags TAGS cscope*
 
 # clean - Delete most, but leave enough to build external modules

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 6f7561730d88c3b8c816e34e76b140cb9612ce8c..30fe668c25425eaf1e1464c6a49d8b170ccc60ca 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -15,7 +15,7 @@
 #include <linux/seqlock.h>
 #include <linux/nodemask.h>
 #include <linux/pageblock-flags.h>
-#include <linux/bounds.h>
+#include <generated/bounds.h>
 #include <asm/atomic.h>
 #include <asm/page.h>
 

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 6b202b173955541adbe03ebd8137af6749f1c214..ef36725aa51527bdf61ce8542f9d85afcb33563e 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -8,7 +8,7 @@
 #include <linux/types.h>
 #ifndef __GENERATING_BOUNDS_H
 #include <linux/mm_types.h>
-#include <linux/bounds.h>
+#include <generated/bounds.h>
 #endif /* !__GENERATING_BOUNDS_H */
 
 /*

diff --git a/kernel/bounds.c b/kernel/bounds.c
index 3c5301381837407d986f06cddaf665eca71fb412..98a51f26c13691b9f6f5955cdc83840f8932c2be 100644 (file)
--- a/kernel/bounds.c
+++ b/kernel/bounds.c
@@ -12,7 +12,7 @@
 
 void foo(void)
 {
-       /* The enum constants to put into include/linux/bounds.h */
+       /* The enum constants to put into include/generated/bounds.h */
        DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS);
        DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES);
        /* End of constants */