public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: ebiederm@xmission.com, akpm@linux-foundation.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] Export kexec.h
Date: Sat, 19 Jun 2010 15:22:35 +0200	[thread overview]
Message-ID: <20100619132235.GA24200@basil.fritz.box> (raw)

Export kexec.h
    
kexec_load is a system call and it needs a header
file with its input arguments.

Export the parts of kexec.h needed for this.

Cc: ebiederm@xmission.com

Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 2fc8e14..8fd5d09 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -389,3 +389,5 @@ unifdef-y += xfrm.h
 objhdr-y += version.h
 header-y += wimax.h
 header-y += wimax/
+
+unifdef-y += kexec.h
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 03e8e8d..f4c5a0e 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -1,8 +1,46 @@
 #ifndef LINUX_KEXEC_H
 #define LINUX_KEXEC_H
 
-#ifdef CONFIG_KEXEC
+/* Kexec: one kernel loading another */
+
+#ifdef __KERNEL__
+#include <linux/compiler.h>
 #include <linux/types.h>
+#endif
+
+#define KEXEC_ON_CRASH		0x00000001
+#define KEXEC_PRESERVE_CONTEXT	0x00000002
+#define KEXEC_ARCH_MASK		0xffff0000
+
+/* These values match the ELF architecture values.
+ * Unless there is a good reason that should continue to be the case.
+ */
+#define KEXEC_ARCH_DEFAULT ( 0 << 16)
+#define KEXEC_ARCH_386     ( 3 << 16)
+#define KEXEC_ARCH_X86_64  (62 << 16)
+#define KEXEC_ARCH_PPC     (20 << 16)
+#define KEXEC_ARCH_PPC64   (21 << 16)
+#define KEXEC_ARCH_IA_64   (50 << 16)
+#define KEXEC_ARCH_ARM     (40 << 16)
+#define KEXEC_ARCH_S390    (22 << 16)
+#define KEXEC_ARCH_SH      (42 << 16)
+#define KEXEC_ARCH_MIPS_LE (10 << 16)
+#define KEXEC_ARCH_MIPS    ( 8 << 16)
+
+#define KEXEC_SEGMENT_MAX 16
+struct kexec_segment {
+	void __user *buf;
+	size_t bufsz;
+#ifdef __KERNEL__
+	unsigned long mem;	/* User space sees this as a (void *) ... */
+#else
+	void *mem;
+#endif
+	size_t memsz;
+};
+
+#ifdef __KERNEL__
+#ifdef CONFIG_KEXEC
 #include <linux/list.h>
 #include <linux/linkage.h>
 #include <linux/compat.h>
@@ -57,14 +95,6 @@ typedef unsigned long kimage_entry_t;
 #define IND_DONE         0x4
 #define IND_SOURCE       0x8
 
-#define KEXEC_SEGMENT_MAX 16
-struct kexec_segment {
-	void __user *buf;
-	size_t bufsz;
-	unsigned long mem;	/* User space sees this as a (void *) ... */
-	size_t memsz;
-};
-
 #ifdef CONFIG_COMPAT
 struct compat_kexec_segment {
 	compat_uptr_t buf;
@@ -163,25 +193,6 @@ extern struct kimage *kexec_crash_image;
 #define kexec_flush_icache_page(page)
 #endif
 
-#define KEXEC_ON_CRASH		0x00000001
-#define KEXEC_PRESERVE_CONTEXT	0x00000002
-#define KEXEC_ARCH_MASK		0xffff0000
-
-/* These values match the ELF architecture values.
- * Unless there is a good reason that should continue to be the case.
- */
-#define KEXEC_ARCH_DEFAULT ( 0 << 16)
-#define KEXEC_ARCH_386     ( 3 << 16)
-#define KEXEC_ARCH_X86_64  (62 << 16)
-#define KEXEC_ARCH_PPC     (20 << 16)
-#define KEXEC_ARCH_PPC64   (21 << 16)
-#define KEXEC_ARCH_IA_64   (50 << 16)
-#define KEXEC_ARCH_ARM     (40 << 16)
-#define KEXEC_ARCH_S390    (22 << 16)
-#define KEXEC_ARCH_SH      (42 << 16)
-#define KEXEC_ARCH_MIPS_LE (10 << 16)
-#define KEXEC_ARCH_MIPS    ( 8 << 16)
-
 /* List of defined/legal kexec flags */
 #ifndef CONFIG_KEXEC_JUMP
 #define KEXEC_FLAGS    KEXEC_ON_CRASH
@@ -215,4 +226,5 @@ struct task_struct;
 static inline void crash_kexec(struct pt_regs *regs) { }
 static inline int kexec_should_crash(struct task_struct *p) { return 0; }
 #endif /* CONFIG_KEXEC */
+#endif
 #endif /* LINUX_KEXEC_H */

             reply	other threads:[~2010-06-19 13:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-19 13:22 Andi Kleen [this message]
2010-06-19 18:24 ` [RFC] use kexec_kernel.h for the kernel-only stuff [Was: [PATCH] Export kexec.h] Sam Ravnborg
2010-06-19 19:53   ` Andi Kleen
2010-06-20  8:23     ` [PATCH] kexec: export kexec.h to userspace Sam Ravnborg
2010-06-20  8:56       ` Eric W. Biederman
2010-06-20  9:23         ` Andi Kleen
2010-07-16  6:54           ` Simon Horman
2010-06-19 19:13 ` [PATCH] Export kexec.h Eric W. Biederman
2010-06-19 19:44   ` Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100619132235.GA24200@basil.fritz.box \
    --to=andi@firstfloor.org \
    --cc=akpm@linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox