## Automatically generated incremental diff ## From: linux-2.4.22-bk61 ## To: linux-2.4.22-bk62 ## Robot: $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $ diff -urN linux-2.4.22-bk61/Makefile linux-2.4.22-bk62/Makefile --- linux-2.4.22-bk61/Makefile 2003-11-26 02:51:16.000000000 -0800 +++ linux-2.4.22-bk62/Makefile 2003-11-26 02:51:23.000000000 -0800 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 4 SUBLEVEL = 22 -EXTRAVERSION = -bk61 +EXTRAVERSION = -bk62 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) diff -urN linux-2.4.22-bk61/arch/x86_64/ia32/ia32entry.S linux-2.4.22-bk62/arch/x86_64/ia32/ia32entry.S --- linux-2.4.22-bk61/arch/x86_64/ia32/ia32entry.S 2003-11-26 02:51:17.000000000 -0800 +++ linux-2.4.22-bk62/arch/x86_64/ia32/ia32entry.S 2003-11-26 02:51:25.000000000 -0800 @@ -322,8 +322,8 @@ .quad stub32_vfork /* 190 */ .quad sys32_getrlimit .quad sys32_mmap2 - .quad sys_truncate - .quad sys_ftruncate + .quad sys32_truncate64 + .quad sys32_ftruncate64 .quad sys32_stat64 /* 195 */ .quad sys32_lstat64 .quad sys32_fstat64 diff -urN linux-2.4.22-bk61/arch/x86_64/ia32/sys_ia32.c linux-2.4.22-bk62/arch/x86_64/ia32/sys_ia32.c --- linux-2.4.22-bk61/arch/x86_64/ia32/sys_ia32.c 2003-11-26 02:51:17.000000000 -0800 +++ linux-2.4.22-bk62/arch/x86_64/ia32/sys_ia32.c 2003-11-26 02:51:25.000000000 -0800 @@ -174,6 +174,19 @@ return putstat(statbuf, &s); } +asmlinkage long +sys32_truncate64(char * filename, unsigned long offset_low, unsigned long offset_high) +{ + return sys_truncate(filename, ((loff_t) offset_high << 32) | offset_low); +} + + +asmlinkage long +sys32_ftruncate64(unsigned int fd, unsigned long offset_low, unsigned long offset_high) +{ + return sys_ftruncate(fd, ((loff_t) offset_high << 32) | offset_low); +} + /* Another set for IA32/LFS -- x86_64 struct stat is different due to support for 64bit inode numbers. */ diff -urN linux-2.4.22-bk61/drivers/char/agp/agpgart_fe.c linux-2.4.22-bk62/drivers/char/agp/agpgart_fe.c --- linux-2.4.22-bk61/drivers/char/agp/agpgart_fe.c 2001-08-12 10:38:48.000000000 -0700 +++ linux-2.4.22-bk62/drivers/char/agp/agpgart_fe.c 2003-11-26 02:51:27.000000000 -0800 @@ -301,7 +301,7 @@ agp_memory *memory; memory = agp_allocate_memory(pg_count, type); - printk(KERN_DEBUG "memory : %p\n", memory); +// printk(KERN_DEBUG "memory : %p\n", memory); if (memory == NULL) { return NULL; }