Update of /cvsroot/mkdump/minik/3.0/2.6/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25992
Modified Files:
minik_dump.c
Log Message:
- CONFIG_x86_64 -> CONFIG_X86_64
- fix set_pte_phys
Index: minik_dump.c
===================================================================
RCS file: /cvsroot/mkdump/minik/3.0/2.6/kernel/minik_dump.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** minik_dump.c 9 Mar 2006 23:49:56 -0000 1.4
--- minik_dump.c 13 Mar 2006 00:34:05 -0000 1.5
***************
*** 201,205 ****
}
! #ifdef CONFIG_x86_64
static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t prot)
{
--- 201,205 ----
}
! #ifdef CONFIG_X86_64
static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t prot)
{
***************
*** 216,226 ****
pud = pud_offset(pgd, vaddr);
if (pud_none(*pud)) {
! BUG();
! return;
}
pmd = pmd_offset(pud, vaddr);
if (pmd_none(*pmd)) {
! BUG();
! return;
}
pte = pte_offset_kernel(pmd, vaddr);
--- 216,234 ----
pud = pud_offset(pgd, vaddr);
if (pud_none(*pud)) {
! pmd = (pmd_t *)get_zeroed_page(GFP_ATOMIC);
! if (!pmd) {
! BUG();
! return;
! }
! set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | _PAGE_USER));
}
pmd = pmd_offset(pud, vaddr);
if (pmd_none(*pmd)) {
! pte = (pte_t *)get_zeroed_page(GFP_ATOMIC);
! if (!pte) {
! BUG();
! return;
! }
! set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE | _PAGE_USER));
}
pte = pte_offset_kernel(pmd, vaddr);
***************
*** 233,237 ****
{
void *vaddr = (void *)fix_to_virt(0);
! #ifdef CONFIG_x86_64
set_pte_pfn((unsigned long)vaddr, pfn, PAGE_READONLY);
#else
--- 241,245 ----
{
void *vaddr = (void *)fix_to_virt(0);
! #ifdef CONFIG_X86_64
set_pte_pfn((unsigned long)vaddr, pfn, PAGE_READONLY);
#else
|
