From: Arjan van de Ven <arjanv@redhat.com>
These module exports have no GPL'ed callers.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/ia64/kernel/sal.c | 38 --------------------------------------
25-akpm/include/asm-ia64/sal.h | 10 ----------
2 files changed, 48 deletions(-)
diff -puN arch/ia64/kernel/sal.c~revert-allow-oem-written-modules-to-make-calls-to-ia64-oem-sal-functions arch/ia64/kernel/sal.c
--- 25/arch/ia64/kernel/sal.c~revert-allow-oem-written-modules-to-make-calls-to-ia64-oem-sal-functions 2004-09-08 13:11:35.381598888 -0700
+++ 25-akpm/arch/ia64/kernel/sal.c 2004-09-08 13:11:35.386598128 -0700
@@ -10,7 +10,6 @@
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/string.h>
@@ -263,40 +262,3 @@ ia64_sal_init (struct ia64_sal_systab *s
p += SAL_DESC_SIZE(*p);
}
}
-
-int
-ia64_sal_oemcall(struct ia64_sal_retval *isrvp, u64 oemfunc, u64 arg1,
- u64 arg2, u64 arg3, u64 arg4, u64 arg5, u64 arg6, u64 arg7)
-{
- if (oemfunc < IA64_SAL_OEMFUNC_MIN || oemfunc > IA64_SAL_OEMFUNC_MAX)
- return -1;
- SAL_CALL(*isrvp, oemfunc, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
- return 0;
-}
-EXPORT_SYMBOL(ia64_sal_oemcall);
-
-int
-ia64_sal_oemcall_nolock(struct ia64_sal_retval *isrvp, u64 oemfunc, u64 arg1,
- u64 arg2, u64 arg3, u64 arg4, u64 arg5, u64 arg6,
- u64 arg7)
-{
- if (oemfunc < IA64_SAL_OEMFUNC_MIN || oemfunc > IA64_SAL_OEMFUNC_MAX)
- return -1;
- SAL_CALL_NOLOCK(*isrvp, oemfunc, arg1, arg2, arg3, arg4, arg5, arg6,
- arg7);
- return 0;
-}
-EXPORT_SYMBOL(ia64_sal_oemcall_nolock);
-
-int
-ia64_sal_oemcall_reentrant(struct ia64_sal_retval *isrvp, u64 oemfunc,
- u64 arg1, u64 arg2, u64 arg3, u64 arg4, u64 arg5,
- u64 arg6, u64 arg7)
-{
- if (oemfunc < IA64_SAL_OEMFUNC_MIN || oemfunc > IA64_SAL_OEMFUNC_MAX)
- return -1;
- SAL_CALL_REENTRANT(*isrvp, oemfunc, arg1, arg2, arg3, arg4, arg5, arg6,
- arg7);
- return 0;
-}
-EXPORT_SYMBOL(ia64_sal_oemcall_reentrant);
diff -puN include/asm-ia64/sal.h~revert-allow-oem-written-modules-to-make-calls-to-ia64-oem-sal-functions include/asm-ia64/sal.h
--- 25/include/asm-ia64/sal.h~revert-allow-oem-written-modules-to-make-calls-to-ia64-oem-sal-functions 2004-09-08 13:11:35.383598584 -0700
+++ 25-akpm/include/asm-ia64/sal.h 2004-09-08 13:11:35.387597976 -0700
@@ -819,16 +819,6 @@ struct sal_ret_values {
long r8; long r9; long r10; long r11;
};
-#define IA64_SAL_OEMFUNC_MIN 0x02000000
-#define IA64_SAL_OEMFUNC_MAX 0x03ffffff
-
-extern int ia64_sal_oemcall(struct ia64_sal_retval *, u64, u64, u64, u64, u64,
- u64, u64, u64);
-extern int ia64_sal_oemcall_nolock(struct ia64_sal_retval *, u64, u64, u64,
- u64, u64, u64, u64, u64);
-extern int ia64_sal_oemcall_reentrant(struct ia64_sal_retval *, u64, u64, u64,
- u64, u64, u64, u64, u64);
-
#endif /* __ASSEMBLY__ */
#endif /* _ASM_IA64_SAL_H */
_