## Automatically generated incremental diff
## From:   linux-2.4.21-bk34
## To:     linux-2.4.21-bk35
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.21-bk34/CREDITS linux-2.4.21-bk35/CREDITS
--- linux-2.4.21-bk34/CREDITS	2003-08-19 02:53:54.000000000 -0700
+++ linux-2.4.21-bk35/CREDITS	2003-08-19 02:53:59.000000000 -0700
@@ -111,16 +111,18 @@
 S: USA
 
 N: Andrea Arcangeli
-E: andrea@e-mind.com
-W: http://e-mind.com/~andrea/
-P: 1024/CB4660B9 CC A0 71 81 F4 A0 63 AC  C0 4B 81 1D 8C 15 C8 E5
+E: andrea@suse.de
+W: http://www.kernel.org/pub/linux/kernel/people/andrea/
+P: 1024D/68B9CB43 13D9 8355 295F 4823 7C49  C012 DFA1 686E 68B9 CB43
+P: 1024R/CB4660B9 CC A0 71 81 F4 A0 63 AC  C0 4B 81 1D 8C 15 C8 E5
 D: Parport hacker
 D: Implemented a workaround for some interrupt buggy printers
-D: Author of pscan that helps to fix lp/parport bug
+D: Author of pscan that helps to fix lp/parport bugs
 D: Author of lil (Linux Interrupt Latency benchmark)
 D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
+D: VM hacker
 D: Various other kernel hacks
-S: Via Ciaclini 26
+S: Via Cicalini 26
 S: Imola 40026
 S: Italy
 
diff -urN linux-2.4.21-bk34/Makefile linux-2.4.21-bk35/Makefile
--- linux-2.4.21-bk34/Makefile	2003-08-19 02:53:54.000000000 -0700
+++ linux-2.4.21-bk35/Makefile	2003-08-19 02:53:59.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -bk34
+EXTRAVERSION = -bk35
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.21-bk34/fs/buffer.c linux-2.4.21-bk35/fs/buffer.c
--- linux-2.4.21-bk34/fs/buffer.c	2003-08-19 02:53:57.000000000 -0700
+++ linux-2.4.21-bk35/fs/buffer.c	2003-08-19 02:54:05.000000000 -0700
@@ -1231,10 +1231,11 @@
 	if (offset >= PAGE_SIZE)
 		BUG();
 
-	/*
-	 * page_address will return NULL anyways for highmem pages
-	 */
-	bh->b_data = page_address(page) + offset;
+	if (PageHighMem(page)) {
+		bh->b_data = (char *)offset;
+	} else {
+		bh->b_data = page_address(page) + offset;
+	}
 	bh->b_page = page;
 }
 EXPORT_SYMBOL(set_bh_page);
