Skip to contentSkip to conversation

Include kexec.h in arch/ia64/kernel/process.c

PATCH In review Horms 3 participants 4 messages Feb 7, 2007 – Feb 8, 2007

lore
Share & tools
lore

Horms

author
#0 lore raw

PATCH 1/1 Include kexec.h in arch/ia64/kernel/process.c

kexec.h is needed by arch/ia64/kernel/process.c so for the declaration of kexec_disable_iosapic() which is used in machine_shutdown().

Index: linux-2.6/arch/ia64/kernel/process.c
=================================--- linux-2.6.orig/arch/ia64/kernel/process.c 2007-02-07 12:43:09.000000000 +0900
+++ linux-2.6/arch/ia64/kernel/process.c 2007-02-07 12:43:16.000000000 +0900
@@ -41,6 +41,7 @@
#include <asm/uaccess.h>
#include <asm/unwind.h>
#include <asm/user.h>
+#include <asm/kexec.h>

#include "entry.h"

#1 lore raw
Quoted 4 lines

kexec.h is needed by arch/ia64/kernel/process.c so for the declaration of kexec_disable_iosapic() which is used in machine_shutdown().

+#include <asm/kexec.h>

I merged this into your earlier change (moving machine_shutdown() into process.c). Linus pulled it last night.

I also added a "#ifdef CONFIG_KEXEC" around the call to kexec_disable_iosapic() (because I first noticed that this was undefined when building non-KEXEC kernels). But perhaps it might have been better to #define an empty stub for this function inside kexec.h for the #ifndef CONFIG_KEXEC case?

-Tony

author
#2 lore raw
Quoted 8 lines · Tony
Quoted 5 lines

kexec.h is needed by arch/ia64/kernel/process.c so for the declaration of kexec_disable_iosapic() which is used in machine_shutdown().

+#include <asm/kexec.h>

I merged this into your earlier change (moving machine_shutdown() into process.c). Linus pulled it last night.

Thanks

Quoted 5 lines

I also added a "#ifdef CONFIG_KEXEC" around the call to kexec_disable_iosapic() (because I first noticed that this was undefined when building non-KEXEC kernels). But perhaps it might have been better to #define an empty stub for this function inside kexec.h for the #ifndef CONFIG_KEXEC case?

Good catch :)

I think that #define in the process.c vs an empty stub inside asm/kexec.h is really a style issue. I'm quite ok with things the way they are. But If you are more comfortable with the stub approach, I have no objections.

Signature · 3 lines
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/
#3 lore raw
Quoted 12 lines · On Thu, 8 Feb 2007 11:19:03 +0900 Horms wrote:
Quoted 8 lines · Tony
Quoted 5 lines

kexec.h is needed by arch/ia64/kernel/process.c so for the declaration of kexec_disable_iosapic() which is used in machine_shutdown().

+#include <asm/kexec.h>

I merged this into your earlier change (moving machine_shutdown() into process.c). Linus pulled it last night.

Thanks

Quoted 7 lines
Quoted 5 lines

I also added a "#ifdef CONFIG_KEXEC" around the call to kexec_disable_iosapic() (because I first noticed that this was undefined when building non-KEXEC kernels). But perhaps it might have been better to #define an empty stub for this function inside kexec.h for the #ifndef CONFIG_KEXEC case?

Good catch :)

uh, every one of Andrew's commit emails now contains the line at the end of my mail sig... Try it sometimes^W often.

Quoted 4 lines

I think that #define in the process.c vs an empty stub inside asm/kexec.h is really a style issue. I'm quite ok with things the way they are. But If you are more comfortable with the stub approach, I have no objections.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***