Merge tag 'v6.10' into android-mainline
Linux 6.10 Change-Id: I269322d76a64da16abf2f75a8f84328572a321e1 Signed-off-by: Matthias Maennich <maennich@google.com> Signed-off-by: Will McVicker <willmcvicker@google.com>
This commit is contained in:
@@ -19,7 +19,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
|
||||
#ifndef sys_mmap
|
||||
asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
|
||||
unsigned long prot, unsigned long flags,
|
||||
unsigned long fd, off_t pgoff);
|
||||
unsigned long fd, unsigned long off);
|
||||
#endif
|
||||
|
||||
#ifndef sys_rt_sigreturn
|
||||
|
||||
Reference in New Issue
Block a user