[parisc-linux-cvs] linux-2.6 tausq

[Randolph Chung]

> 2.6.7-pa9: remove STI console warning and special casing

both willy and fleedwood think this is ok, so...  :)

randolph


Index: Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/Makefile,v
retrieving revision 1.215
diff -u -p -r1.215 Makefile
--- Makefile	9 Jul 2004 19:04:20 -0000	1.215
+++ Makefile	9 Jul 2004 20:19:23 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 7
-EXTRAVERSION = -pa8
+EXTRAVERSION = -pa9
 NAME=Zonked Quokka
 
 # *DOCUMENTATION*
Index: arch/parisc/mm/init.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/mm/init.c,v
retrieving revision 1.7
diff -u -p -r1.7 init.c
--- arch/parisc/mm/init.c	9 Jul 2004 19:04:20 -0000	1.7
+++ arch/parisc/mm/init.c	9 Jul 2004 20:19:15 -0000
@@ -626,8 +626,6 @@ static void __init map_pages(unsigned lo
 			for (tmp2 = start_pte; tmp2 < PTRS_PER_PTE; tmp2++,pg_table++) {
 				pte_t pte;
 
-#if !defined(CONFIG_STI_CONSOLE)
-#warning STI console should explicitly allocate executable pages but does not
 				/*
 				 * Map the fault vector writable so we can
 				 * write the HPMC checksum.
@@ -637,7 +635,6 @@ static void __init map_pages(unsigned lo
 							&& address != gw_addr)
 				    pte = __mk_pte(address, PAGE_KERNEL_RO);
 				else
-#endif
 				    pte = __mk_pte(address, pgprot);
 
 				if (address >= end_paddr)