diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
| commit | 1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2 (patch) | |
| tree | 735b11a744d0acd18a1d7b7a4a5fa63fc6d23b92 /arch/sparc/mm/hugetlbpage.c | |
| parent | d0ba9bcf001c7907e4755b0e498f5ff9d1a228ef (diff) | |
| parent | f6bdaab79ee4228a143ee1b4cb80416d6ffc0c63 (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/mm/hugetlbpage.c')
| -rw-r--r-- | arch/sparc/mm/hugetlbpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index eee601a0d2cf..80504148d8a5 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -260,7 +260,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, } pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, - pte_t *ptep) + pte_t *ptep, unsigned long sz) { unsigned int i, nptes, orig_shift, shift; unsigned long size; |