[PATCH-2.5] SRM cleanup for generic Alpha kernels

[Jan-Benedict Glaw <jbglaw@lug-owl.de>]

[-- Attachment #1: Type: text/plain, Size: 1660 bytes --]

Hi Linus!

Please apply this patch to current 2.5.x kernels.

	- alpha_using_srm is #define'd for machine specific kernels, but
	  is a real integer variable for generic Alpha kernels. Export
	  it...
	
	- The callback_* functions are _always_ there (they might be NOP
	  functions owith generic kernels on non-SRM machines).

	- srm_env can now be compiled on generic alpha kernels. An
	  explicit check for SRM capability was always there:-)

Please apply!

MfG, JBG


--- linux-2.5.18-srm/arch/alpha/kernel/alpha_ksyms.c.orig	Sun May 26 23:16:40 2002
+++ linux-2.5.18-srm/arch/alpha/kernel/alpha_ksyms.c	Sun May 26 23:19:36 2002
@@ -58,11 +58,12 @@
 EXPORT_SYMBOL(probe_irq_mask);
 EXPORT_SYMBOL(screen_info);
 EXPORT_SYMBOL(perf_irq);
-#ifdef CONFIG_ALPHA_SRM
 EXPORT_SYMBOL(callback_getenv);
 EXPORT_SYMBOL(callback_setenv);
 EXPORT_SYMBOL(callback_save_env);
-#endif /* CONFIG_ALPHA_SRM */
+#ifdef CONFIG_ALPHA_GENERIC
+EXPORT_SYMBOL(alpha_using_srm);
+#endif /* CONFIG_ALPHA_GENERIC */
 
 /* platform dependent support */
 EXPORT_SYMBOL(_inb);
--- linux-2.5.18-srm/arch/alpha/config.in.orig	Sun May 26 02:05:53 2002
+++ linux-2.5.18-srm/arch/alpha/config.in	Sun May 26 02:07:37 2002
@@ -259,7 +259,7 @@
 	"ELF		CONFIG_KCORE_ELF	\
 	 A.OUT		CONFIG_KCORE_AOUT" ELF
 fi
-if [ "$CONFIG_PROC_FS" != "n" -a "$CONFIG_ALPHA_SRM" = "y" ]; then
+if [ "$CONFIG_PROC_FS" != "n" ]; then
    tristate 'SRM environment through procfs' CONFIG_SRM_ENV
 fi
  

-- 
Jan-Benedict Glaw   .   jbglaw@lug-owl.de   .   +49-172-7608481
	 -- New APT-Proxy written in shell script --
	   http://lug-owl.de/~jbglaw/software/ap2/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]