rpms/kernel/devel linux-2.6-compile-fixes.patch,1.121,1.122

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27179

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
buildfix

linux-2.6-compile-fixes.patch:
 linux-2.6.19.noarch/include/asm-i386/desc.h        |   28 ++++++++++-----------
 linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c |    4 +++
 2 files changed, 18 insertions(+), 14 deletions(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- linux-2.6-compile-fixes.patch	29 Dec 2006 06:03:21 -0000	1.121
+++ linux-2.6-compile-fixes.patch	29 Dec 2006 06:14:05 -0000	1.122
@@ -5,50 +5,55 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
-#--- linux-2.6.19.noarch/include/asm-i386/desc.h~	2006-12-08 06:52:55.000000000 -0500
-#+++ linux-2.6.19.noarch/include/asm-i386/desc.h	2006-12-08 06:53:14.000000000 -0500
-#@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
-# 	return base;
-# }
-# 
-#+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-#+{
-#+	limit = (limit - 1) / PAGE_SIZE;
-#+	desc->a = limit & 0xffff;
-#+	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-#+}
-#+
-#+#define load_user_cs_desc(cpu, mm) \
-#+	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-#+
-#+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-#+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-#+extern void arch_flush_exec_range(struct mm_struct *mm);
-#+
-# #else /* __ASSEMBLY__ */
-# 
-# /*
-#@@ -208,20 +222,6 @@ static inline unsigned long get_desc_bas
-# 	shll $16, base; \
-# 	movw idx*8+2(gdt), lo_w;
-# 
-#-static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-#-{
-#-	limit = (limit - 1) / PAGE_SIZE;
-#-	desc->a = limit & 0xffff;
-#-	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-#-}
-#-
-#-#define load_user_cs_desc(cpu, mm) \
-#-	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-#-
-#-extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-#-extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-#-extern void arch_flush_exec_range(struct mm_struct *mm);
-#-
-# #endif /* !__ASSEMBLY__ */
-# 
-# #endif
+arch/i386/kernel/process.c: In function '__switch_to':
+arch/i386/kernel/process.c:645: error: implicit declaration of function 'load_user_cs_desc'
+arch/i386/kernel/process.c: In function 'arch_add_exec_range':
+arch/i386/kernel/process.c:915: error: implicit declaration of function 'set_user_cs'
+
+--- linux-2.6.19.noarch/include/asm-i386/desc.h~	2006-12-08 06:52:55.000000000 -0500
++++ linux-2.6.19.noarch/include/asm-i386/desc.h	2006-12-08 06:53:14.000000000 -0500
+@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas
+ 	return base;
+ }
+ 
++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
++{
++	limit = (limit - 1) / PAGE_SIZE;
++	desc->a = limit & 0xffff;
++	desc->b = (limit & 0xf0000) | 0x00c0fb00;
++}
++
++#define load_user_cs_desc(cpu, mm) \
++	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
++
++extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
++extern void arch_flush_exec_range(struct mm_struct *mm);
++
+ #else /* __ASSEMBLY__ */
+ 
+ /*
+@@ -208,20 +222,6 @@ static inline unsigned long get_desc_bas
+ 	shll $16, base; \
+ 	movw idx*8+2(gdt), lo_w;
+ 
+-static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
+-{
+-	limit = (limit - 1) / PAGE_SIZE;
+-	desc->a = limit & 0xffff;
+-	desc->b = (limit & 0xf0000) | 0x00c0fb00;
+-}
+-
+-#define load_user_cs_desc(cpu, mm) \
+-	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
+-
+-extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
+-extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
+-extern void arch_flush_exec_range(struct mm_struct *mm);
+-
+ #endif /* !__ASSEMBLY__ */
+ 
+ #endif
 
 
 #drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices':