[patch] 2.6.12-rc4-mm1 missing ia64_sal_oemcall_reentrant

[patch] 2.6.12-rc4-mm1 missing ia64_sal_oemcall_reentrant

[Jes Sorensen]

Hi,

The following patch adds the missing ia64_sal_oemcall_reentrant function
so 2.6.12-rc4-mm1 builds and boots on the SN2 again.

Cheers,
Jes

Add missing ia64_sal_oemcall_reentrant function as per the prototype
found in include/asm-ia64/sal.h.

Signed-off-by: Jes Sorensen <jes@trained-monkey.org>

--- linux-2.6.12-rc4-mm1/arch/ia64/kernel/sal.c~	2005-05-12 04:06:48 -07:00
+++ linux-2.6.12-rc4-mm1/arch/ia64/kernel/sal.c	2005-05-12 04:27:19 -07:00
@@ -285,3 +285,15 @@
 			arg7);
 	return 0;
 }
+
+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;
+}

Re: [patch] 2.6.12-rc4-mm1 missing ia64_sal_oemcall_reentrant

[Greg Edwards]

On Thu, May 12, 2005 at 07:47:23AM -0400, Jes Sorensen wrote:
| Hi,
| 
| The following patch adds the missing ia64_sal_oemcall_reentrant function
| so 2.6.12-rc4-mm1 builds and boots on the SN2 again.
| 
| Cheers,
| Jes
| 
| Add missing ia64_sal_oemcall_reentrant function as per the prototype
| found in include/asm-ia64/sal.h.
| 
| Signed-off-by: Jes Sorensen <jes@trained-monkey.org>

Andrew,

The whole remove-exports-for-oem-modules.patch should be dropped.  The
SGI Altix xp* drivers use these, which just appeared with 2.6.12-rc4.

http://kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h°d82bd5df874f7dadbeced1b0163473387da37c
http://kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h‰eb8eb927e324366c3ac0458998aaf9953fc5cd
http://kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h¢d974da0afe659cff98913184a97c0ee686d02b

Greg