diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2023-10-05 10:05:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2023-10-05 10:05:51 +0200 |
| commit | 3fc18b06b8f3408951b5e43548f22984412b0831 (patch) | |
| tree | 5d509acc9a9010aae791cdba9e9f6a02e94b962c /arch/parisc/include/asm/hugetlb.h | |
| parent | x86: Make IA32_EMULATION boot time configurable (diff) | |
| parent | Linux 6.6-rc4 (diff) | |
| download | linux-3fc18b06b8f3408951b5e43548f22984412b0831.tar.gz linux-3fc18b06b8f3408951b5e43548f22984412b0831.tar.bz2 linux-3fc18b06b8f3408951b5e43548f22984412b0831.zip | |
Merge tag 'v6.6-rc4' into x86/entry, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/include/asm/hugetlb.h')
| -rw-r--r-- | arch/parisc/include/asm/hugetlb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/hugetlb.h b/arch/parisc/include/asm/hugetlb.h index f7f078c2872c..72daacc472a0 100644 --- a/arch/parisc/include/asm/hugetlb.h +++ b/arch/parisc/include/asm/hugetlb.h @@ -6,7 +6,7 @@ #define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte); + pte_t *ptep, pte_t pte, unsigned long sz); #define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, |