diff for duplicates of <1144975523.5817.84.camel@linux-znh> diff --git a/a/1.txt b/N1/1.txt index 4610213..438a915 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -127,10 +127,10 @@ diff -Nraup a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c - end = htlbpage_to_page(end); + addr = htlbpage_to_page(mm, addr); + end = htlbpage_to_page(mm, end); - if (REGION_NUMBER(floor) = RGN_HPAGE) + if (REGION_NUMBER(floor) == RGN_HPAGE) - floor = htlbpage_to_page(floor); + floor = htlbpage_to_page(mm, floor); - if (REGION_NUMBER(ceiling) = RGN_HPAGE) + if (REGION_NUMBER(ceiling) == RGN_HPAGE) - ceiling = htlbpage_to_page(ceiling); + ceiling = htlbpage_to_page(mm, ceiling); @@ -277,15 +277,15 @@ diff -Nraup a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c int lastshift; u16 areamask, curareas; -- if (HPAGE_SHIFT = 0) -+ if (HPAGE_SHIFT(current->mm) = 0) +- if (HPAGE_SHIFT == 0) ++ if (HPAGE_SHIFT(current->mm) == 0) return -EINVAL; if (len & ~HPAGE_MASK) return -EINVAL; @@ -700,7 +700,7 @@ static unsigned int hash_huge_page_do_la /* page is dirty */ if (!test_bit(PG_arch_1, &page->flags) && !PageReserved(page)) { - if (trap = 0x400) { + if (trap == 0x400) { - for (i = 0; i < (HPAGE_SIZE / PAGE_SIZE); i++) + for (i = 0; i < (HPAGE_SIZE(current->mm) / PAGE_SIZE); i++) __flush_dcache_icache(page_address(page+i)); @@ -432,7 +432,7 @@ diff -Nraup a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c 2006-04-12 10:09:37.000000000 +0800 @@ -325,7 +325,7 @@ void update_mmu_cache(struct vm_area_str (tlb_type != hypervisor && - (pte_val(pte) & _PAGE_SZALL_4U) = _PAGE_SZHUGE_4U)) { + (pte_val(pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U)) { tsb_index = MM_TSB_HUGE; - tsb_hash_shift = HPAGE_SHIFT; + tsb_hash_shift = HPAGE_SHIFT(mm); @@ -609,7 +609,7 @@ diff -Nraup a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c @@ -632,13 +637,13 @@ hugetlbfs_parse_options(char *options, s else if (!strcmp(opt, "size")) { unsigned long long size = memparse(value, &rest); - if (*rest = '%') { + if (*rest == '%') { - size <<= HPAGE_SHIFT; + size <<= HUGETLB_INIT_PAGE_SHIFT; size *= max_huge_pages; @@ -718,8 +718,8 @@ diff -Nraup a/include/asm-ia64/page.h b/include/asm-ia64/page.h +# define HUGETLB_INIT_PAGE_MASK (~(HUGETLB_INIT_PAGE_SIZE - 1)) + # define is_hugepage_only_range(mm, addr, len) \ - (REGION_NUMBER(addr) = RGN_HPAGE || \ - REGION_NUMBER((addr)+(len)-1) = RGN_HPAGE) + (REGION_NUMBER(addr) == RGN_HPAGE || \ + REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE) -extern unsigned int hpage_shift; +extern unsigned int init_hpage_shift; #endif @@ -960,7 +960,7 @@ diff -Nraup a/include/linux/mm.h b/include/linux/mm.h static inline int is_valid_hpage_size(unsigned long long size) { - return 1; -+ return (size = HPAGE_SIZE(0)); ++ return (size == HPAGE_SIZE(0)); } #else extern void hugepage_size_init(struct mm_struct *mm); @@ -1095,7 +1095,7 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c - HUGETLB_PAGE_ORDER); + order); nid = next_node(nid, node_online_map); - if (nid = MAX_NUMNODES) + if (nid == MAX_NUMNODES) nid = first_node(node_online_map); if (page) { page[1].lru.next = (void *)free_huge_page; /* dtor */ @@ -1136,9 +1136,9 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c + if (free_huge_pages[order] <= reserved_huge_pages[order]) goto fail; } else { -- BUG_ON(reserved_huge_pages = 0); +- BUG_ON(reserved_huge_pages == 0); - reserved_huge_pages--; -+ BUG_ON(reserved_huge_pages[order] = 0); ++ BUG_ON(reserved_huge_pages[order] == 0); + reserved_huge_pages[order]--; } @@ -1199,9 +1199,9 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c - unsigned long i; + unsigned long i, j; -- if (HPAGE_SHIFT = 0) +- if (HPAGE_SHIFT == 0) +#ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE -+ if (HPAGE_SHIFT(0) = 0) ++ if (HPAGE_SHIFT(0) == 0) return 0; +#endif @@ -1360,7 +1360,7 @@ diff -Nraup a/mm/hugetlb.c b/mm/hugetlb.c /* @@ -440,7 +450,8 @@ int copy_hugetlb_page_range(struct mm_st - cow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) = VM_MAYWRITE; + cow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE; - for (addr = vma->vm_start; addr < vma->vm_end; addr += HPAGE_SIZE) { + for (addr = vma->vm_start; addr < vma->vm_end; @@ -1509,7 +1509,7 @@ diff -Nraup a/mm/mempolicy.c b/mm/mempolicy.c --- a/mm/mempolicy.c 2006-04-12 10:12:43.000000000 +0800 +++ b/mm/mempolicy.c 2006-04-12 10:09:37.000000000 +0800 @@ -1170,7 +1170,7 @@ struct zonelist *huge_zonelist(struct vm - if (pol->policy = MPOL_INTERLEAVE) { + if (pol->policy == MPOL_INTERLEAVE) { unsigned nid; - nid = interleave_nid(pol, vma, addr, HPAGE_SHIFT); diff --git a/a/content_digest b/N1/content_digest index 1043ffb..e97c797 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,8 +3,8 @@ "ref\01144974881.5817.59.camel@linux-znh\0" "ref\01144975292.5817.74.camel@linux-znh\0" "From\0Zou Nan hai <nanhai.zou@intel.com>\0" - "Subject\0Re: [PATCH 4/8] IA64 various hugepage size - modify HPAGE related\0" - "Date\0Fri, 14 Apr 2006 00:45:24 +0000\0" + "Subject\0Re: [PATCH 4/8] IA64 various hugepage size - modify HPAGE related macros\0" + "Date\014 Apr 2006 08:45:24 +0800\0" "To\0LKML <linux-kernel@vger.kernel.org>\0" "Cc\0Linux-IA64 <linux-ia64@vger.kernel.org>" Tony <tony.luck@intel.com> @@ -140,10 +140,10 @@ "-\tend = htlbpage_to_page(end);\n" "+\taddr = htlbpage_to_page(mm, addr);\n" "+\tend = htlbpage_to_page(mm, end);\n" - " \tif (REGION_NUMBER(floor) = RGN_HPAGE)\n" + " \tif (REGION_NUMBER(floor) == RGN_HPAGE)\n" "-\t\tfloor = htlbpage_to_page(floor);\n" "+\t\tfloor = htlbpage_to_page(mm, floor);\n" - " \tif (REGION_NUMBER(ceiling) = RGN_HPAGE)\n" + " \tif (REGION_NUMBER(ceiling) == RGN_HPAGE)\n" "-\t\tceiling = htlbpage_to_page(ceiling);\n" "+\t\tceiling = htlbpage_to_page(mm, ceiling);\n" " \n" @@ -290,15 +290,15 @@ " \tint lastshift;\n" " \tu16 areamask, curareas;\n" " \n" - "-\tif (HPAGE_SHIFT = 0)\n" - "+\tif (HPAGE_SHIFT(current->mm) = 0)\n" + "-\tif (HPAGE_SHIFT == 0)\n" + "+\tif (HPAGE_SHIFT(current->mm) == 0)\n" " \t\treturn -EINVAL;\n" " \tif (len & ~HPAGE_MASK)\n" " \t\treturn -EINVAL;\n" "@@ -700,7 +700,7 @@ static unsigned int hash_huge_page_do_la\n" " \t/* page is dirty */\n" " \tif (!test_bit(PG_arch_1, &page->flags) && !PageReserved(page)) {\n" - " \t\tif (trap = 0x400) {\n" + " \t\tif (trap == 0x400) {\n" "-\t\t\tfor (i = 0; i < (HPAGE_SIZE / PAGE_SIZE); i++)\n" "+\t\t\tfor (i = 0; i < (HPAGE_SIZE(current->mm) / PAGE_SIZE); i++)\n" " \t\t\t\t__flush_dcache_icache(page_address(page+i));\n" @@ -445,7 +445,7 @@ "+++ b/arch/sparc64/mm/init.c\t2006-04-12 10:09:37.000000000 +0800\n" "@@ -325,7 +325,7 @@ void update_mmu_cache(struct vm_area_str\n" " \t\t (tlb_type != hypervisor &&\n" - " \t\t (pte_val(pte) & _PAGE_SZALL_4U) = _PAGE_SZHUGE_4U)) {\n" + " \t\t (pte_val(pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U)) {\n" " \t\t\ttsb_index = MM_TSB_HUGE;\n" "-\t\t\ttsb_hash_shift = HPAGE_SHIFT;\n" "+\t\t\ttsb_hash_shift = HPAGE_SHIFT(mm);\n" @@ -622,7 +622,7 @@ "@@ -632,13 +637,13 @@ hugetlbfs_parse_options(char *options, s\n" " \t\telse if (!strcmp(opt, \"size\")) {\n" " \t\t\tunsigned long long size = memparse(value, &rest);\n" - " \t\t\tif (*rest = '%') {\n" + " \t\t\tif (*rest == '%') {\n" "-\t\t\t\tsize <<= HPAGE_SHIFT;\n" "+\t\t\t\tsize <<= HUGETLB_INIT_PAGE_SHIFT;\n" " \t\t\t\tsize *= max_huge_pages;\n" @@ -731,8 +731,8 @@ "+# define HUGETLB_INIT_PAGE_MASK (~(HUGETLB_INIT_PAGE_SIZE - 1))\n" "+\n" " # define is_hugepage_only_range(mm, addr, len)\t\t\\\n" - " \t (REGION_NUMBER(addr) = RGN_HPAGE ||\t\\\n" - " \t REGION_NUMBER((addr)+(len)-1) = RGN_HPAGE)\n" + " \t (REGION_NUMBER(addr) == RGN_HPAGE ||\t\\\n" + " \t REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE)\n" "-extern unsigned int hpage_shift;\n" "+extern unsigned int init_hpage_shift;\n" " #endif\n" @@ -973,7 +973,7 @@ " static inline int is_valid_hpage_size(unsigned long long size)\n" " {\n" "-\treturn 1;\n" - "+\treturn (size = HPAGE_SIZE(0));\n" + "+\treturn (size == HPAGE_SIZE(0));\n" " }\n" " #else\n" " extern void hugepage_size_init(struct mm_struct *mm);\n" @@ -1108,7 +1108,7 @@ "-\t\t\t\t\tHUGETLB_PAGE_ORDER);\n" "+\t\t\t\torder);\n" " \tnid = next_node(nid, node_online_map);\n" - " \tif (nid = MAX_NUMNODES)\n" + " \tif (nid == MAX_NUMNODES)\n" " \t\tnid = first_node(node_online_map);\n" " \tif (page) {\n" " \t\tpage[1].lru.next = (void *)free_huge_page;\t/* dtor */\n" @@ -1149,9 +1149,9 @@ "+\t\tif (free_huge_pages[order] <= reserved_huge_pages[order])\n" " \t\t\tgoto fail;\n" " \t} else {\n" - "-\t\tBUG_ON(reserved_huge_pages = 0);\n" + "-\t\tBUG_ON(reserved_huge_pages == 0);\n" "-\t\treserved_huge_pages--;\n" - "+\t\tBUG_ON(reserved_huge_pages[order] = 0);\n" + "+\t\tBUG_ON(reserved_huge_pages[order] == 0);\n" "+\t\treserved_huge_pages[order]--;\n" " \t}\n" " \n" @@ -1212,9 +1212,9 @@ "-\tunsigned long i;\n" "+\tunsigned long i, j;\n" " \n" - "-\tif (HPAGE_SHIFT = 0)\n" + "-\tif (HPAGE_SHIFT == 0)\n" "+#ifndef ARCH_HAS_VARIABLE_HUGEPAGE_SIZE\n" - "+\tif (HPAGE_SHIFT(0) = 0)\n" + "+\tif (HPAGE_SHIFT(0) == 0)\n" " \t\treturn 0;\n" "+#endif\n" " \n" @@ -1373,7 +1373,7 @@ " /*\n" "@@ -440,7 +450,8 @@ int copy_hugetlb_page_range(struct mm_st\n" " \n" - " \tcow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) = VM_MAYWRITE;\n" + " \tcow = (vma->vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE;\n" " \n" "-\tfor (addr = vma->vm_start; addr < vma->vm_end; addr += HPAGE_SIZE) {\n" "+\tfor (addr = vma->vm_start; addr < vma->vm_end; \n" @@ -1522,7 +1522,7 @@ "--- a/mm/mempolicy.c\t2006-04-12 10:12:43.000000000 +0800\n" "+++ b/mm/mempolicy.c\t2006-04-12 10:09:37.000000000 +0800\n" "@@ -1170,7 +1170,7 @@ struct zonelist *huge_zonelist(struct vm\n" - " \tif (pol->policy = MPOL_INTERLEAVE) {\n" + " \tif (pol->policy == MPOL_INTERLEAVE) {\n" " \t\tunsigned nid;\n" " \n" "-\t\tnid = interleave_nid(pol, vma, addr, HPAGE_SHIFT);\n" @@ -1554,4 +1554,4 @@ " \n" " \tif (mm->map_count >= sysctl_max_map_count)" -600b4bf7a93ca8727372771f875a588c2f071dd505c3e9b1dfd9ac58bebd86a8 +c3991d3a75d750b12edd02ddb4a9093caa1b39094f1bdd278bb6920e6e5aae33
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.