Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c378a656 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k update from Geert Uytterhoeven:
  - More barrier.h consolidation
  - Sched_[gs]etattr() syscalls

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Wire up sched_setattr and sched_getattr
  m68k: Switch to asm-generic/barrier.h
  m68k: Sort arch/m68k/include/asm/Kbuild
parents bafb8192 7247f553

arch/m68k/include/asm/Kbuild

+3 −3
Original line number Diff line number Diff line 


generic-y += barrier.h

generic-y += bitsperlong.h

generic-y += clkdev.h

generic-y += cputime.h
@@ -6,6 +6,7 @@ generic-y += device.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += hash.h

generic-y += hw_irq.h

generic-y += ioctl.h

generic-y += ipcbuf.h
@@ -18,6 +19,7 @@ generic-y += local.h 
generic-y += mman.h

generic-y += mutex.h

generic-y += percpu.h

generic-y += preempt.h

generic-y += resource.h

generic-y += scatterlist.h

generic-y += sections.h
@@ -31,5 +33,3 @@ generic-y += trace_clock.h 
generic-y += types.h

generic-y += word-at-a-time.h

generic-y += xor.h
 
generic-y += preempt.h

generic-y += hash.h

arch/m68k/include/asm/barrier.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _M68K_BARRIER_H

#define _M68K_BARRIER_H



#define nop()		do { asm volatile ("nop"); barrier(); } while (0)



#include <asm-generic/barrier.h>



#endif /* _M68K_BARRIER_H */

arch/m68k/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <uapi/asm/unistd.h>





#define NR_syscalls		349

#define NR_syscalls		351



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

arch/m68k/include/uapi/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -354,5 +354,7 @@ 
#define __NR_process_vm_writev	346

#define __NR_kcmp		347

#define __NR_finit_module	348

#define __NR_sched_setattr	349

#define __NR_sched_getattr	350



#endif /* _UAPI_ASM_M68K_UNISTD_H_ */

arch/m68k/kernel/syscalltable.S

+2 −0
Original line number Diff line number Diff line
@@ -369,4 +369,6 @@ ENTRY(sys_call_table) 
	.long sys_process_vm_writev

	.long sys_kcmp

	.long sys_finit_module

	.long sys_sched_setattr

	.long sys_sched_getattr		/* 350 */