Re: [kbuild-devel] Re: Announce: Kernel Build for 2.5, Release 2.4 is available

[Thomas Duffy <tduffy@directvinternet.com>]

[-- Attachment #1: Type: text/plain, Size: 616 bytes --]

On Sun, 2002-05-05 at 23:27, Keith Owens wrote:
> kbuild-2.5-common-2.5.14-1 and kbuild-2.5-i386-2.5.14-1 are available.
> Upgraded to kernel 2.5.14.

here is the sparc64 kbuild against core-11 and 2.5.14

you must apply the linux-2.5.14-sparc64-hacks.patch first to get sparc64
to build on 2.5.14 (even using kbuild 2.4)

0) untar linux-2.5.14.tar.bz2
1) apply linux-2.5.14-sparc64-hacks.patch
2) apply kbuild-2.5-core-11
3) apply kbuild-2.5-common-2.5.14-1
4) apply kbuild-2.5-sparc64-2.5.14-1

you should be good to go...

this patch still needs work on the asm-offsets to get it work The Right
Way (tm)

-tduffy

[-- Attachment #2: linux-2.5.14-sparc64-hacks.patch --]
[-- Type: text/plain, Size: 2994 bytes --]

--- linux-2.5.14+kbuild-v2.1+common-1+core-11+i386-1/include/asm-sparc64/page.h	Sun May  5 20:38:01 2002
+++ linux-2.5.14+kbuild-v2.1+common-1+core-11+i386-1+sparc64-1/include/asm-sparc64/page.h	Mon May  6 11:02:04 2002
@@ -113,8 +113,17 @@
 
 #define __pa(x)			((unsigned long)(x) - PAGE_OFFSET)
 #define __va(x)			((void *)((unsigned long) (x) + PAGE_OFFSET))
+
+#if 0
 #define virt_to_page(kaddr)	(mem_map + ((__pa(kaddr)-phys_base) >> PAGE_SHIFT))
 #define VALID_PAGE(page)	((page - mem_map) < max_mapnr)
+#endif
+
+#define pfn_to_page(pfn)	(mem_map + (pfn))
+#define page_to_pfn(page)	((unsigned long)((page) - mem_map))
+#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr-phys_base) >> PAGE_SHIFT)
+#define pfn_valid(pfn)		((pfn) < max_mapnr)
+#define virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr-phys_base) >> PAGE_SHIFT)
 
 #define virt_to_phys __pa
 #define phys_to_virt __va
--- linux-2.5.14+kbuild-v2.1+common-1+core-11+i386-1/arch/sparc64/kernel/ioctl32.c	Sun May  5 20:37:59 2002
+++ linux-2.5.14+kbuild-v2.1+common-1+core-11+i386-1+sparc64-1/arch/sparc64/kernel/ioctl32.c	Mon May  6 11:17:15 2002
@@ -4553,8 +4553,8 @@
 COMPATIBLE_IOCTL(HCIDEVUP)
 COMPATIBLE_IOCTL(HCIDEVDOWN)
 COMPATIBLE_IOCTL(HCIDEVRESET)
-COMPATIBLE_IOCTL(HCIRESETSTAT)
-COMPATIBLE_IOCTL(HCIGETINFO)
+/* COMPATIBLE_IOCTL(HCIRESETSTAT) */
+/* COMPATIBLE_IOCTL(HCIGETINFO) */
 COMPATIBLE_IOCTL(HCIGETDEVLIST)
 COMPATIBLE_IOCTL(HCISETRAW)
 COMPATIBLE_IOCTL(HCISETSCAN)
--- linux-2.5.14+kbuild-v2.1+common-1+core-11+i386-1/include/asm-sparc64/pgtable.h	Sun May  5 20:37:53 2002
+++ linux-2.5.14+kbuild-v2.1+common-1+core-11+i386-1+sparc64-1/include/asm-sparc64/pgtable.h	Tue May  7 09:41:53 2002
@@ -194,13 +194,22 @@
 extern struct page *mem_map_zero;
 #define ZERO_PAGE(vaddr)	(mem_map_zero)
 
+#if 0
 /* Warning: These take pointers to page structs now... */
 #define mk_pte(page, pgprot)		\
 	__pte((((page - mem_map) << PAGE_SHIFT)+phys_base) | pgprot_val(pgprot) | _PAGE_SZBITS)
+#endif
+
+#define pfn_pte(pfn, pgprot)		\
+	__pte((((pfn) << PAGE_SHIFT)+phys_base) | pgprot_val(pgprot) | _PAGE_SZBITS)
+#define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))
+
 #define page_pte_prot(page, prot)	mk_pte(page, prot)
 #define page_pte(page)			page_pte_prot(page, __pgprot(0))
 
+#if 0
 #define mk_pte_phys(physpage, pgprot)	(__pte((physpage) | pgprot_val(pgprot) | _PAGE_SZBITS))
+#endif
 
 extern inline pte_t pte_modify(pte_t orig_pte, pgprot_t new_prot)
 {
@@ -246,7 +255,12 @@
 /* Permanent address of a page. */
 #define __page_address(page)	page_address(page)
 
+#if 0
 #define pte_page(x) (mem_map+(((pte_val(x)&_PAGE_PADDR)-phys_base)>>PAGE_SHIFT))
+#endif
+
+#define pte_page(x) pfn_to_page(pte_pfn(x))
+#define pte_pfn(x) (((pte_val(x)&_PAGE_PADDR)-phys_base)>>PAGE_SHIFT)
 
 /* Be very careful when you change these three, they are delicate. */
 #define pte_mkyoung(pte)	(__pte(pte_val(pte) | _PAGE_ACCESSED | _PAGE_R))

[-- Attachment #3: kbuild-2.5-sparc64-2.5.14-1.bz2 --]
[-- Type: application/x-bzip, Size: 6641 bytes --]