diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2025-03-19 08:58:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-03-19 08:58:07 +0100 |
| commit | 1a7c3068143be177deea86d977d3042a0c256706 (patch) | |
| tree | 82eef5ceb0f3cc15a6cdf617ca4511db3af73e21 /arch/parisc/mm/hugetlbpage.c | |
| parent | ALSA: usb-audio: Fix CME quirk for UF series keyboards (diff) | |
| parent | ALSA: hda/realtek: Support mute LED on HP Laptop 15s-du3xxx (diff) | |
| download | wireguard-linux-1a7c3068143be177deea86d977d3042a0c256706.tar.xz wireguard-linux-1a7c3068143be177deea86d977d3042a0c256706.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 6.14 devel branch for further developments of TAS
codecsBack-merge of 6.14 devel branch for further developments.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to '')
| -rw-r--r-- | arch/parisc/mm/hugetlbpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c index e9d18cf25b79..a94fe546d434 100644 --- a/arch/parisc/mm/hugetlbpage.c +++ b/arch/parisc/mm/hugetlbpage.c @@ -126,7 +126,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) { pte_t entry; |