rpms/kernel/devel kernel-2.6.spec, 1.2086, 1.2087 linux-2.6-compile-fixes.patch, 1.57, 1.58 linux-2.6-xen-compile-fixes.patch, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Mar 23 21:21:25 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11466
Modified Files:
kernel-2.6.spec linux-2.6-compile-fixes.patch
linux-2.6-xen-compile-fixes.patch
Log Message:
really fix the set_page_count() xen thing & get it to compile
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2086
retrieving revision 1.2087
diff -u -r1.2086 -r1.2087
--- kernel-2.6.spec 23 Mar 2006 20:25:45 -0000 1.2086
+++ kernel-2.6.spec 23 Mar 2006 21:21:22 -0000 1.2087
@@ -1646,6 +1646,9 @@
%changelog
* Thu Mar 23 2006 Juan Quintela <quintela at redhat.com>
+- disable sky2 (as it is broken upstream)
+
+* Thu Mar 23 2006 Juan Quintela <quintela at redhat.com>
- fix xen to compile with 2.6.16-git6.
* Thu Mar 23 2006 Dave Jones <davej at redhat.com>
linux-2.6-compile-fixes.patch:
0 files changed
Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- linux-2.6-compile-fixes.patch 23 Mar 2006 20:24:56 -0000 1.57
+++ linux-2.6-compile-fixes.patch 23 Mar 2006 21:21:22 -0000 1.58
@@ -1,123 +0,0 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/init-xen.c linux-2.6.16.noarch/arch/i386/mm/init-xen.c
---- linux-2.6.16.orig/arch/i386/mm/init-xen.c 2006-03-23 16:45:01.000000000 +0100
-+++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c 2006-03-23 19:03:36.000000000 +0100
-@@ -317,7 +317,7 @@ static void __init permanent_kmaps_init(
-
- static void __meminit free_new_highpage(struct page *page, int pfn)
- {
-- set_page_count(page, 1);
-+ init_page_count(page);
- if (pfn < xen_start_info->nr_pages)
- __free_page(page);
- totalhigh_pages++;
-@@ -676,7 +676,7 @@ void __init mem_init(void)
- /* XEN: init and count low-mem pages outside initial allocation. */
- for (pfn = xen_start_info->nr_pages; pfn < max_low_pfn; pfn++) {
- ClearPageReserved(&mem_map[pfn]);
-- set_page_count(&mem_map[pfn], 1);
-+ init_page_count(&mem_map[pfn]);
- totalram_pages++;
- }
-
-@@ -814,7 +814,7 @@ void free_initmem(void)
- addr = (unsigned long)(&__init_begin);
- for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
- ClearPageReserved(virt_to_page(addr));
-- set_page_count(virt_to_page(addr), 1);
-+ init_page_count(virt_to_page(addr));
- memset((void *)addr, 0xcc, PAGE_SIZE);
- free_page(addr);
- totalram_pages++;
-@@ -853,7 +853,7 @@ void free_initrd_mem(unsigned long start
- printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
- for (; start < end; start += PAGE_SIZE) {
- ClearPageReserved(virt_to_page(start));
-- set_page_count(virt_to_page(start), 1);
-+ init_page_count(virt_to_page(start));
- free_page(start);
- totalram_pages++;
- }
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c
---- linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c 2006-03-23 16:44:59.000000000 +0100
-+++ linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c 2006-03-23 19:04:29.000000000 +0100
-@@ -236,7 +236,7 @@ struct page *pte_alloc_one(struct mm_str
- pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
- if (pte) {
- SetPageForeign(pte, pte_free);
-- set_page_count(pte, 1);
-+ init_page_count(pte);
- }
- #endif
- return pte;
-@@ -251,7 +251,7 @@ void pte_free(struct page *pte)
- va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0));
-
- ClearPageForeign(pte);
-- set_page_count(pte, 1);
-+ init_page_count(pte);
-
- __free_page(pte);
- }
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
---- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-03-23 16:44:53.000000000 +0100
-+++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-03-23 19:02:17.000000000 +0100
-@@ -812,7 +812,7 @@ void __init clear_kernel_mapping(unsigne
- void online_page(struct page *page)
- {
- ClearPageReserved(page);
-- set_page_count(page, 1);
-+ init_page_count(page);
- __free_page(page);
- totalram_pages++;
- num_physpages++;
-@@ -930,7 +930,7 @@ void free_initmem(void)
- addr = (unsigned long)(&__init_begin);
- for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
- ClearPageReserved(virt_to_page(addr));
-- set_page_count(virt_to_page(addr), 1);
-+ init_page_count(virt_to_page(addr));
- memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE);
- make_page_writable(
- __va(__pa(addr)), XENFEAT_writable_page_tables);
-@@ -978,7 +978,7 @@ void free_initrd_mem(unsigned long start
- printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
- for (; start < end; start += PAGE_SIZE) {
- ClearPageReserved(virt_to_page(start));
-- set_page_count(virt_to_page(start), 1);
-+ init_page_count(virt_to_page(start));
- free_page(start);
- totalram_pages++;
- }
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/balloon/balloon.c linux-2.6.16.noarch/drivers/xen/balloon/balloon.c
---- linux-2.6.16.orig/drivers/xen/balloon/balloon.c 2006-03-23 16:44:53.000000000 +0100
-+++ linux-2.6.16.noarch/drivers/xen/balloon/balloon.c 2006-03-23 19:00:45.000000000 +0100
-@@ -231,7 +231,7 @@ static int increase_reservation(unsigned
-
- /* Relinquish the page back to the allocator. */
- ClearPageReserved(page);
-- set_page_count(page, 1);
-+ init_page_count(page);
- __free_page(page);
- }
-
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/netback/netback.c linux-2.6.16.noarch/drivers/xen/netback/netback.c
---- linux-2.6.16.orig/drivers/xen/netback/netback.c 2006-03-23 16:44:53.000000000 +0100
-+++ linux-2.6.16.noarch/drivers/xen/netback/netback.c 2006-03-23 19:00:32.000000000 +0100
-@@ -665,7 +665,7 @@ static void netif_page_release(struct pa
- u16 pending_idx = page - virt_to_page(mmap_vstart);
-
- /* Ready for next use. */
-- set_page_count(page, 1);
-+ init_page_count(page);
-
- netif_idx_release(pending_idx);
- }
-@@ -785,7 +785,7 @@ static int __init netback_init(void)
-
- for (i = 0; i < MAX_PENDING_REQS; i++) {
- page = virt_to_page(MMAP_VADDR(i));
-- set_page_count(page, 1);
-+ init_page_count(page);
- SetPageForeign(page, netif_page_release);
- }
-
linux-2.6-xen-compile-fixes.patch:
arch/i386/kernel/acpi/boot-xen.c | 3 +-
linux-2.6.15.ia64/fs/Kconfig | 1
linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 --
linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1
linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1
linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 +
linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ----
linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 -
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++-
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 -
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 +
linux-2.6.16.noarch/arch/i386/mm/init-xen.c | 8 +++---
linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c | 4 +--
linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c | 6 ++--
linux-2.6.16.noarch/drivers/xen/balloon/balloon.c | 2 -
linux-2.6.16.noarch/drivers/xen/netback/netback.c | 4 +--
21 files changed, 59 insertions(+), 25 deletions(-)
Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-xen-compile-fixes.patch 6 Mar 2006 16:31:47 -0000 1.2
+++ linux-2.6-xen-compile-fixes.patch 23 Mar 2006 21:21:22 -0000 1.3
@@ -231,3 +231,126 @@
return 0;
}
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/init-xen.c linux-2.6.16.noarch/arch/i386/mm/init-xen.c
+--- linux-2.6.16.orig/arch/i386/mm/init-xen.c 2006-03-23 16:45:01.000000000 +0100
++++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c 2006-03-23 19:03:36.000000000 +0100
+@@ -317,7 +317,7 @@ static void __init permanent_kmaps_init(
+
+ static void __meminit free_new_highpage(struct page *page, int pfn)
+ {
+- set_page_count(page, 1);
++ init_page_count(page);
+ if (pfn < xen_start_info->nr_pages)
+ __free_page(page);
+ totalhigh_pages++;
+@@ -676,7 +676,7 @@ void __init mem_init(void)
+ /* XEN: init and count low-mem pages outside initial allocation. */
+ for (pfn = xen_start_info->nr_pages; pfn < max_low_pfn; pfn++) {
+ ClearPageReserved(&mem_map[pfn]);
+- set_page_count(&mem_map[pfn], 1);
++ init_page_count(&mem_map[pfn]);
+ totalram_pages++;
+ }
+
+@@ -814,7 +814,7 @@ void free_initmem(void)
+ addr = (unsigned long)(&__init_begin);
+ for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
+ ClearPageReserved(virt_to_page(addr));
+- set_page_count(virt_to_page(addr), 1);
++ init_page_count(virt_to_page(addr));
+ memset((void *)addr, 0xcc, PAGE_SIZE);
+ free_page(addr);
+ totalram_pages++;
+@@ -853,7 +853,7 @@ void free_initrd_mem(unsigned long start
+ printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+ for (; start < end; start += PAGE_SIZE) {
+ ClearPageReserved(virt_to_page(start));
+- set_page_count(virt_to_page(start), 1);
++ init_page_count(virt_to_page(start));
+ free_page(start);
+ totalram_pages++;
+ }
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c
+--- linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c 2006-03-23 16:44:59.000000000 +0100
++++ linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c 2006-03-23 19:04:29.000000000 +0100
+@@ -236,7 +236,7 @@ struct page *pte_alloc_one(struct mm_str
+ pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
+ if (pte) {
+ SetPageForeign(pte, pte_free);
+- set_page_count(pte, 1);
++ init_page_count(pte);
+ }
+ #endif
+ return pte;
+@@ -251,7 +251,7 @@ void pte_free(struct page *pte)
+ va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0));
+
+ ClearPageForeign(pte);
+- set_page_count(pte, 1);
++ init_page_count(pte);
+
+ __free_page(pte);
+ }
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
+--- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-03-23 16:44:53.000000000 +0100
++++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-03-23 19:02:17.000000000 +0100
+@@ -812,7 +812,7 @@ void __init clear_kernel_mapping(unsigne
+ void online_page(struct page *page)
+ {
+ ClearPageReserved(page);
+- set_page_count(page, 1);
++ init_page_count(page);
+ __free_page(page);
+ totalram_pages++;
+ num_physpages++;
+@@ -930,7 +930,7 @@ void free_initmem(void)
+ addr = (unsigned long)(&__init_begin);
+ for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
+ ClearPageReserved(virt_to_page(addr));
+- set_page_count(virt_to_page(addr), 1);
++ init_page_count(virt_to_page(addr));
+ memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE);
+ make_page_writable(
+ __va(__pa(addr)), XENFEAT_writable_page_tables);
+@@ -978,7 +978,7 @@ void free_initrd_mem(unsigned long start
+ printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+ for (; start < end; start += PAGE_SIZE) {
+ ClearPageReserved(virt_to_page(start));
+- set_page_count(virt_to_page(start), 1);
++ init_page_count(virt_to_page(start));
+ free_page(start);
+ totalram_pages++;
+ }
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/balloon/balloon.c linux-2.6.16.noarch/drivers/xen/balloon/balloon.c
+--- linux-2.6.16.orig/drivers/xen/balloon/balloon.c 2006-03-23 16:44:53.000000000 +0100
++++ linux-2.6.16.noarch/drivers/xen/balloon/balloon.c 2006-03-23 19:00:45.000000000 +0100
+@@ -231,7 +231,7 @@ static int increase_reservation(unsigned
+
+ /* Relinquish the page back to the allocator. */
+ ClearPageReserved(page);
+- set_page_count(page, 1);
++ init_page_count(page);
+ __free_page(page);
+ }
+
+diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/netback/netback.c linux-2.6.16.noarch/drivers/xen/netback/netback.c
+--- linux-2.6.16.orig/drivers/xen/netback/netback.c 2006-03-23 16:44:53.000000000 +0100
++++ linux-2.6.16.noarch/drivers/xen/netback/netback.c 2006-03-23 19:00:32.000000000 +0100
+@@ -665,7 +665,7 @@ static void netif_page_release(struct pa
+ u16 pending_idx = page - virt_to_page(mmap_vstart);
+
+ /* Ready for next use. */
+- set_page_count(page, 1);
++ init_page_count(page);
+
+ netif_idx_release(pending_idx);
+ }
+@@ -785,7 +785,7 @@ static int __init netback_init(void)
+
+ for (i = 0; i < MAX_PENDING_REQS; i++) {
+ page = virt_to_page(MMAP_VADDR(i));
+- set_page_count(page, 1);
++ init_page_count(page);
+ SetPageForeign(page, netif_page_release);
+ }
+
More information about the fedora-cvs-commits
mailing list