Index: linux-libc-headers/include/asm-ia64/page.h
===================================================================
RCS file: /cvsroot/linux-libc-headers/include/asm-ia64/page.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-libc-headers/include/asm-ia64/page.h	27 Mar 2004 16:02:58 -0000	1.5
+++ linux-libc-headers/include/asm-ia64/page.h	10 Jul 2004 12:32:13 -0000	1.6
@@ -23,7 +23,9 @@
 #elif defined(CONFIG_IA64_PAGE_SIZE_64KB)
 # define PAGE_SHIFT	16
 #else
-# error Unsupported page size!
+/* take 16kB as default for llh */
+# define PAGE_SHIFT	14
+/* # error Unsupported page size! */
 #endif
 
 #define PAGE_SIZE		(__IA64_UL_CONST(1) << PAGE_SHIFT)
Index: linux-libc-headers/include/asm-ia64/gcc_intrin.h
===================================================================
RCS file: /cvsroot/linux-libc-headers/include/asm-ia64/gcc_intrin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-libc-headers/include/asm-ia64/gcc_intrin.h	23 Jun 2004 19:57:17 -0000	1.3
+++ linux-libc-headers/include/asm-ia64/gcc_intrin.h	13 Jul 2004 22:33:12 -0000	1.4
@@ -23,8 +23,6 @@
 extern void ia64_bad_param_for_setreg (void);
 extern void ia64_bad_param_for_getreg (void);
 
-register unsigned long ia64_r13 asm ("r13") __attribute_used__;
-
 #define ia64_setreg(regnum, val)						\
 ({										\
 	switch (regnum) {							\
@@ -57,6 +55,7 @@
 #define ia64_getreg(regnum)							\
 ({										\
 	__u64 ia64_intri_res;							\
+	register unsigned long ia64_r13 asm ("r13") __attribute_used__;		\
 										\
 	switch (regnum) {							\
 	case _IA64_REG_GP:							\