[PATCH 2/2] x86: Provide guards in uapi/asm/setup.h to preventdeletion by patch

[David Howells]

Provide reinclusion guards in the empty uapi/asm/setup.h to make sure that the
patch program doesn't delete it.

However, should some part of asm/hw_setup.h actually be exported here, or,
possibly, should the entire uapi file be removed?  In v3.6, though the file
was marked for export to userspace, it had nothing outside of __KERNEL__.

Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
cc: Jean Delvare <khali@xxxxxxxxxxxx>
---

 arch/x86/include/uapi/asm/setup.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/include/uapi/asm/setup.h b/arch/x86/include/uapi/asm/setup.h
index e69de29..96a4d53 100644
--- a/arch/x86/include/uapi/asm/setup.h
+++ b/arch/x86/include/uapi/asm/setup.h
@@ -0,0 +1,4 @@
+#ifndef _UAPI_ASM_X86_SETUP_H
+#define _UAPI_ASM_X86_SETUP_H
+
+#endif /* _UAPI_ASM_X86_SETUP_H */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/