Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

diff --cc mm/highmem.c
index 68fedb0e559f23f116aeeda547ff257eff880e8c,96e51a8b749cffe7826f9731f91fa1a5c9e2a890..68bacfed4618fa0c5e9a326575ab9d9991e69d6d
--- 1/mm/highmem.c
--- 2/mm/highmem.c
+++ b/mm/highmem.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <linux/mempool.h>
  #include <linux/blkdev.h>
  #include <linux/init.h>
 +#include <linux/hash.h>
  #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
  
  static mempool_t *page_pool, *isa_page_pool;