headers
Linux Kernel Mailing List | 1 May 2003 01:35

Merge bk://kernel.bkbits.net/gregkh/linux/linus-2.5

ChangeSet 1.1185, 2003/04/30 16:35:24-07:00, torvalds <at> home.transmeta.com

	Merge bk://kernel.bkbits.net/gregkh/linux/linus-2.5
	into home.transmeta.com:/home/torvalds/v2.5/linux

# This patch includes the following deltas:
#	           ChangeSet	1.1184+1.1165.1.16 -> 1.1185 
#

 0 files changed
Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 May 2003 03:00

[PATCH] cs46xx: fix incomplete search-and-replace

ChangeSet 1.1186, 2003/04/30 18:00:45-07:00, akpm <at> digeo.com

	[PATCH] cs46xx: fix incomplete search-and-replace
	
	Leftovers from the mem_map_reserve-removal patch.

# This patch includes the following deltas:
#	           ChangeSet	1.1185  -> 1.1186 
#	  sound/oss/cs46xx.c	1.28    -> 1.29   
#

 cs46xx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -Nru a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
--- a/sound/oss/cs46xx.c	Wed Apr 30 19:08:19 2003
+++ b/sound/oss/cs46xx.c	Wed Apr 30 19:08:19 2003
 <at>  <at>  -1247,7 +1247,7  <at>  <at> 
 		mapend = virt_to_page(dmabuf->rawbuf + 
 				(PAGE_SIZE << dmabuf->buforder) - 1);
 		for (map = virt_to_page(dmabuf->rawbuf); map <= mapend; map++)
-			cs4x_ClearPageReserved(map);
+			ClearPageReserved(map);
 		free_dmabuf(state->card, dmabuf);
 	}

 <at>  <at>  -1256,7 +1256,7  <at>  <at> 
 		mapend = virt_to_page(dmabuf->tmpbuff +
 				(PAGE_SIZE << dmabuf->buforder_tmpbuff) - 1);
 		for (map = virt_to_page(dmabuf->tmpbuff); map <= mapend; map++)
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 May 2003 03:13

[PATCH] Fix prefetch patching in 2.5-bk

ChangeSet 1.1187, 2003/04/30 18:13:50-07:00, ak <at> muc.de

	[PATCH] Fix prefetch patching in 2.5-bk
	
	Brown paperbag time. I forgot to take the modrm byte in account
	with the prefetch patch replacement.  With 3.2 it worked because
	it used the right registers in my configuration.
	
	But gcc 2.96 uses a different register in __dpath and the prefetch becomes
	4 bytes with modrm and the original nop needs to be as long as that too.

# This patch includes the following deltas:
#	           ChangeSet	1.1186  -> 1.1187 
#	include/asm-i386/processor.h	1.47    -> 1.48   
#

 processor.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -Nru a/include/asm-i386/processor.h b/include/asm-i386/processor.h
--- a/include/asm-i386/processor.h	Wed Apr 30 19:08:31 2003
+++ b/include/asm-i386/processor.h	Wed Apr 30 19:08:31 2003
 <at>  <at>  -564,7 +564,7  <at>  <at> 
 #define ARCH_HAS_PREFETCH
 extern inline void prefetch(const void *x)
 {
-	alternative_input(ASM_NOP3,
+	alternative_input(ASM_NOP4,
 			  "prefetchnta (%1)",
 			  X86_FEATURE_XMM,
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 May 2003 06:44

[PATCH] x86-64 update

ChangeSet 1.1188, 2003/04/30 21:44:30-07:00, ak <at> muc.de

	[PATCH] x86-64 update
	
	Just make x86-64/amd64 compile again.  Only architecture specific
	changes.
	
	And a workaround for the Opteron prefetch bug.
	
	Also remove the obsolete LVM1 ioctl emulation code.

# This patch includes the following deltas:
#	           ChangeSet	1.1187  -> 1.1188 
#	include/asm-x86_64/floppy.h	1.1     -> 1.2    
#	arch/x86_64/ia32/sys_ia32.c	1.30    -> 1.31   
#	arch/x86_64/kernel/irq.c	1.12    -> 1.13   
#	include/asm-x86_64/mpspec.h	1.4     -> 1.5    
#	arch/x86_64/ia32/ia32_ioctl.c	1.21    -> 1.22   
#	arch/x86_64/kernel/time.c	1.14    -> 1.15   
#	include/asm-x86_64/msr.h	1.4     -> 1.5    
#	include/asm-x86_64/vsyscall.h	1.4     -> 1.5    
#	include/asm-x86_64/processor.h	1.14    -> 1.15   
#

 arch/x86_64/ia32/ia32_ioctl.c  |  445 -----------------------------------------
 arch/x86_64/ia32/sys_ia32.c    |   22 --
 arch/x86_64/kernel/irq.c       |    4 
 arch/x86_64/kernel/time.c      |    4 
 include/asm-x86_64/floppy.h    |    6 
 include/asm-x86_64/mpspec.h    |    2
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 May 2003 06:52

[PATCH] discontigmem fix

ChangeSet 1.1189, 2003/04/30 21:52:59-07:00, ak <at> muc.de

	[PATCH] discontigmem fix
	
	Try to avoid calling "pfn_to_page()" on invalid pfn's.  It used to be
	legal, but the CONFIG_DISCONTIGMEM people want us to try to avoid it,
	since they do magic stuff in their "pfn_to_page" translations.

# This patch includes the following deltas:
#	           ChangeSet	1.1188  -> 1.1189 
#	         mm/memory.c	1.121   -> 1.122  
#

 memory.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff -Nru a/mm/memory.c b/mm/memory.c
--- a/mm/memory.c	Wed Apr 30 23:12:27 2003
+++ b/mm/memory.c	Wed Apr 30 23:12:27 2003
 <at>  <at>  -292,8 +292,11  <at>  <at> 
 				 * and not mapped via rmap - duplicate the
 				 * mapping as is.
 				 */
-				page = pfn_to_page(pfn);
-				if (!pfn_valid(pfn) || PageReserved(page)) {
+				page = NULL;
+				if (pfn_valid(pfn)) 
+					page = pfn_to_page(pfn); 
+
+				if (!page || PageReserved(page)) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 May 2003 08:18

[PATCH] i386 vsyscall DSO implementation

ChangeSet 1.1190, 2003/05/01 23:18:50-07:00, roland <at> redhat.com

	[PATCH] i386 vsyscall DSO implementation
	
	This creates the full debugging input for the vsyscall page as a DSO,
	allowing for debuggers and exception handlers to correctly handle the
	processor state during the vsyscall.
	
	There was a small bug in the core dump changes in the original patch I
	posted.  I fixed that, and the rest of the patch is unchanged.

# This patch includes the following deltas:
#	           ChangeSet	1.1189  -> 1.1190 
#	 include/linux/elf.h	1.21    -> 1.22   
#	arch/i386/kernel/Makefile	1.38    -> 1.39   
#	arch/i386/kernel/entry.S	1.60    -> 1.61   
#	     fs/binfmt_elf.c	1.43    -> 1.44   
#	arch/i386/kernel/signal.c	1.29    -> 1.30   
#	include/asm-i386/elf.h	1.7     -> 1.8    
#	arch/i386/kernel/sysenter.c	1.12    -> 1.13   
#	               (new)	        -> 1.1     arch/i386/kernel/vsyscall.lds
#	               (new)	        -> 1.1     arch/i386/kernel/vsyscall-sysenter.S
#	               (new)	        -> 1.1     arch/i386/kernel/vsyscall-sigreturn.S
#	               (new)	        -> 1.1     arch/i386/kernel/vsyscall-int80.S
#

 arch/i386/kernel/Makefile             |   22 ++++
 arch/i386/kernel/entry.S              |    4 
 arch/i386/kernel/signal.c             |    9 +
 arch/i386/kernel/sysenter.c           |  155 +++-------------------------------
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 May 2003 09:58

[PATCH] Fix the DSO patch..

ChangeSet 1.1191, 2003/05/02 00:58:32-07:00, roland <at> redhat.com

	[PATCH] Fix the DSO patch..
	
	D'oh!  My patch didn't include the new file:

# This patch includes the following deltas:
#	           ChangeSet	1.1190  -> 1.1191 
#	               (new)	        -> 1.1     arch/i386/kernel/vsyscall.S
#

 vsyscall.S |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

diff -Nru a/arch/i386/kernel/vsyscall.S b/arch/i386/kernel/vsyscall.S
--- /dev/null	Wed Dec 31 16:00:00 1969
+++ b/arch/i386/kernel/vsyscall.S	Fri May  2 02:10:54 2003
 <at>  <at>  -0,0 +1,15  <at>  <at> 
+#include <linux/init.h>
+
+__INITDATA
+
+	.globl vsyscall_int80_start, vsyscall_int80_end
+vsyscall_int80_start:
+	.incbin "arch/i386/kernel/vsyscall-int80.so"
+vsyscall_int80_end:
+
+	.globl vsyscall_sysenter_start, vsyscall_sysenter_end
+vsyscall_sysenter_start:
+	.incbin "arch/i386/kernel/vsyscall-sysenter.so"
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 2 May 2003 10:29

DRI texmem branch merge cleanups. Texture ages are unsigned, and

ChangeSet 1.1192, 2003/05/02 01:29:38-07:00, torvalds <at> home.transmeta.com

	DRI texmem branch merge cleanups. Texture ages are unsigned, and
	radeon should use generic texture structure now.

# This patch includes the following deltas:
#	           ChangeSet	1.1191  -> 1.1192 
#	drivers/char/drm/radeon_drv.h	1.20    -> 1.21   
#	drivers/char/drm/r128_drm.h	1.7     -> 1.8    
#	drivers/char/drm/radeon_drm.h	1.13    -> 1.14   
#

 r128_drm.h   |    2 +-
 radeon_drm.h |   10 ++--------
 radeon_drv.h |    1 +
 3 files changed, 4 insertions(+), 9 deletions(-)

diff -Nru a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
--- a/drivers/char/drm/r128_drm.h	Fri May  2 02:11:04 2003
+++ b/drivers/char/drm/r128_drm.h	Fri May  2 02:11:04 2003
 <at>  <at>  -162,7 +162,7  <at>  <at> 
 	unsigned int last_dispatch;

 	drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS+1];
-	int tex_age[R128_NR_TEX_HEAPS];
+	unsigned int tex_age[R128_NR_TEX_HEAPS];
 	int ctx_owner;
 } drm_r128_sarea_t;

diff -Nru a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 May 2003 10:10

[SPARC]: Replace "magic" values.

ChangeSet 1.1187.1.1, 2003/05/01 01:10:11-07:00, wesolows <at> foobazco.org

	[SPARC]: Replace "magic" values.

# This patch includes the following deltas:
#	           ChangeSet	1.1187  -> 1.1187.1.1
#	arch/sparc/kernel/head.S	1.6     -> 1.7    
#	include/asm-sparc/page.h	1.8     -> 1.9    
#

 arch/sparc/kernel/head.S |   11 ++++-------
 include/asm-sparc/page.h |    1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff -Nru a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
--- a/arch/sparc/kernel/head.S	Sat May  3 11:09:56 2003
+++ b/arch/sparc/kernel/head.S	Sat May  3 11:09:56 2003
 <at>  <at>  -25,6 +25,7  <at>  <at> 
 #include <asm/winmacro.h>
 #include <asm/thread_info.h>	/* TI_UWINMASK */
 #include <asm/errno.h>
+#include <asm/pgtsrmmu.h>	/* SRMMU_PGDIR_SHIFT */

 	.data
 /* 
 <at>  <at>  -623,12 +624,8  <at>  <at> 
 		/* Ok, pull in the PTD. */
 		lda	[%o1] ASI_M_BYPASS, %o2		! This is the 0x0 16MB pgd

-		/* Calculate to KERNBASE entry.
(Continue reading)

Permalink | Reply | 0 comments |
headers
Linux Kernel Mailing List | 1 May 2003 10:17

[SPARC64]: Fix ioctl32.c in latest BK.

ChangeSet 1.1187.1.2, 2003/05/01 01:17:41-07:00, bcollins <at> debian.org

	[SPARC64]: Fix ioctl32.c in latest BK.

# This patch includes the following deltas:
#	           ChangeSet	1.1187.1.1 -> 1.1187.1.2
#	arch/sparc64/kernel/ioctl32.c	1.60    -> 1.61   
#

 ioctl32.c |    1 -
 1 files changed, 1 deletion(-)

diff -Nru a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c
--- a/arch/sparc64/kernel/ioctl32.c	Sat May  3 11:10:41 2003
+++ b/arch/sparc64/kernel/ioctl32.c	Sat May  3 11:10:41 2003
 <at>  <at>  -115,7 +115,6  <at>  <at> 
 #define EXT2_IOC32_GETVERSION             _IOR('v', 1, int)
 #define EXT2_IOC32_SETVERSION             _IOW('v', 2, int)

-extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);

 static int w_long(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
Permalink | Reply | 0 comments |

Gmane