Clean up IA32 support a little...

Linux-ia64 Peter Chubb 2 participants 2 messages Apr 18, 2002

Share & tools

Peter Chubb

author

2002-04-18 01:17 UTC #0 lore raw

Hi,
The attached patch cleans up IA32 support a little.
As it's impossible at present to compile and use IA32 support as a module, disallow that; and also provide dummy functions to remove compilation warnings if CONFIG_IA32_SUPPORT is off.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.494 -> 1.495
# include/asm-ia64/system.h 1.9 -> 1.10
# arch/ia64/config.in 1.16 -> 1.17
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/04/18 [email protected] 1.495
# Disallow compiling IA32 support as a module (it doesn't work) and make sure that

# if IA32 support is not enabled, the resulting compilation com,pletes without warnings.
# --------------------------------------------
#
diff -Nru a/arch/ia64/config.in b/arch/ia64/config.in
--- a/arch/ia64/config.in	Thu Apr 18 11:14:25 2002
+++ b/arch/ia64/config.in	Thu Apr 18 11:14:25 2002
@@ -83,7 +83,7 @@
 define_bool CONFIG_KCORE_ELF y	# On IA-64, we always want an ELF /proc/kcore.

bool 'SMP support' CONFIG_SMP
-tristate 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT +bool 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT
bool 'Performance monitor support' CONFIG_PERFMON tristate '/proc/pal support' CONFIG_IA64_PALINFO
tristate '/proc/efi/vars support' CONFIG_EFI_VARS

include/asm-ia64/system.h +3 -0

diff -Nru a/include/asm-ia64/system.h b/include/asm-ia64/system.h
@@ -353,6 +353,9 @@
 # define IS_IA32_PROCESS(regs)	(ia64_psr(regs)->is != 0)
 #else
 # define IS_IA32_PROCESS(regs)		0
+struct task_struct;
+static inline void ia32_save_state(struct task_struct *t __attribute__((unused))){}
+static inline void ia32_load_state(struct task_struct *t __attribute__((unused))){}
 #endif
 
 /*

[email protected]

2002-04-18 14:13 UTC #1 lore raw

Peter-

This seems reasonable to me.

About module support, I haven't really given that a thought although it might be a good idea. Especially as the need for IA32 support drops off it would make sense to provide this as a module, just in case. I'll add this to the ToDo list.

Quoted 53 lines · Peter Chubb

Hi,
The attached patch cleans up IA32 support a little.
As it's impossible at present to compile and use IA32 support as a module, disallow that; and also provide dummy functions to remove compilation warnings if CONFIG_IA32_SUPPORT is off.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.494 -> 1.495
# include/asm-ia64/system.h 1.9 -> 1.10
# arch/ia64/config.in 1.16 -> 1.17
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/04/18 [email protected] 1.495
# Disallow compiling IA32 support as a module (it doesn't work) and make sure that
# if IA32 support is not enabled, the resulting compilation com,pletes without warnings.
# --------------------------------------------
#
diff -Nru a/arch/ia64/config.in b/arch/ia64/config.in
arch/ia64/config.in +1 -1
@@ -83,7 +83,7 @@
 define_bool CONFIG_KCORE_ELF y	# On IA-64, we always want an ELF /proc/kcore.
 
 bool 'SMP support' CONFIG_SMP
-tristate 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT
+bool 'Support running of Linux/x86 binaries' CONFIG_IA32_SUPPORT
 bool 'Performance monitor support' CONFIG_PERFMON
 tristate '/proc/pal support' CONFIG_IA64_PALINFO
 tristate '/proc/efi/vars support' CONFIG_EFI_VARS
diff -Nru a/include/asm-ia64/system.h b/include/asm-ia64/system.h
include/asm-ia64/system.h +3 -0
@@ -353,6 +353,9 @@
 # define IS_IA32_PROCESS(regs)	(ia64_psr(regs)->is != 0)
 #else
 # define IS_IA32_PROCESS(regs)		0
+struct task_struct;
+static inline void ia32_save_state(struct task_struct *t __attribute__((unused))){}
+static inline void ia32_load_state(struct task_struct *t __attribute__((unused))){}
 #endif
 
 /*
_______________________________________________
Linux-IA64 mailing list
[email protected]
http://lists.linuxia64.org/lists/listinfo/linux-ia64

Signature · 4 lines

Don Dugger
"Censeo Toto nos in Kansa esse decisse." - D. Gale
[email protected]
Ph: 303/652-0870x117