[OpenAFS-devel] linux PPC64 uses 'current' in kernel headers

[Troy Benjegerdes]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_narn.hozed.org-8623-1150221873-0001-2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

This patch fixes a conflict with the PPC64 usage of 'current' in kernel
headers.


--=_narn.hozed.org-8623-1150221873-0001-2
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=openafs-dev-better-cachefiles-info

# HG changeset patch
# User hozer@minbar-g5.scl.ameslab.gov
# Date Tue Jun  6 21:51:20 2006
# Node ID c784244cbc19689e29d55837b0fc58a4abd06fbd
# parent: 0e2f8a7721a29bbc40fea36653de741384e2a9a4
Powerpc64 defines 'current' in the linux headers somewhere,
change the variable name to 'temp' instead.


--- a/src/afs/afs_util.c	Fri May 26 00:17:20 2006
+++ b/src/afs/afs_util.c	Tue Jun  6 21:51:20 2006
@@ -612,13 +612,13 @@
 	if(offset == 64){
 #if defined(AFSBIG_ENDIAN)
 	    int i;
-	    afs_uint32 current[16];
+	    afs_uint32 temp[16];
 	    struct x32 *us = (struct x32*)m->save;
 	    for(i = 0; i < 8; i++){
-		current[2*i+0] = swap_u_int32_t(us[i].a);
-		current[2*i+1] = swap_u_int32_t(us[i].b);
+		temp[2*i+0] = swap_u_int32_t(us[i].a);
+		temp[2*i+1] = swap_u_int32_t(us[i].b);
 	    }
-	    calc(m, current);
+	    calc(m, temp);
 #else
 	    calc(m, (afs_uint32*)m->save);
 #endif


--=_narn.hozed.org-8623-1150221873-0001-2--