2014-02-04 20:16:10

by Geert Uytterhoeven

Subject: [PATCH 1/3] m68k: Sort arch/m68k/include/asm/Kbuild

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/asm/Kbuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 7cc8c364924d..df4d46fc321b 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,4 +1,3 @@
-
generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cputime.h
@@ -6,6 +5,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 +18,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 +32,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
--
1.7.9.5

2014-02-04 20:16:09

by Geert Uytterhoeven

Subject: [PATCH 3/3] m68k: Wire up sched_setattr and sched_getattr

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/asm/unistd.h | 2 +-
arch/m68k/include/uapi/asm/unistd.h | 2 ++
arch/m68k/kernel/syscalltable.S | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 014f288fc813..9d38b73989eb 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -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
diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h
index 625f321001dc..b932dd470041 100644
--- a/arch/m68k/include/uapi/asm/unistd.h
+++ b/arch/m68k/include/uapi/asm/unistd.h
@@ -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_ */
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 3f04ea0ab802..b6223dc41d82 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -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 */

--
1.7.9.5

2014-02-04 20:16:07

by Geert Uytterhoeven

Subject: [PATCH 2/3] m68k: Switch to asm-generic/barrier.h

The generic nop() implementation is fine for m68k.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/barrier.h | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
delete mode 100644 arch/m68k/include/asm/barrier.h

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index df4d46fc321b..6fb9e813a910 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,3 +1,4 @@
+generic-y += barrier.h
generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cputime.h
diff --git a/arch/m68k/include/asm/barrier.h b/arch/m68k/include/asm/barrier.h
deleted file mode 100644
index 15c5f77c1614..000000000000
--- a/arch/m68k/include/asm/barrier.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#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 */
--
1.7.9.5

2014-02-05 01:08:12

by Greg Ungerer

Subject: Re: [PATCH 1/3] m68k: Sort arch/m68k/include/asm/Kbuild

On 05/02/14 06:15, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Acked-by: Greg Ungerer <[email protected]>

> ---
> arch/m68k/include/asm/Kbuild | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 7cc8c364924d..df4d46fc321b 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -1,4 +1,3 @@
> -
> generic-y += bitsperlong.h
> generic-y += clkdev.h
> generic-y += cputime.h
> @@ -6,6 +5,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 +18,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 +32,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
>

2014-02-05 01:08:46

by Greg Ungerer

Subject: Re: [PATCH 2/3] m68k: Switch to asm-generic/barrier.h

On 05/02/14 06:15, Geert Uytterhoeven wrote:
> The generic nop() implementation is fine for m68k.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Acked-by: Greg Ungerer <[email protected]>


> ---
> arch/m68k/include/asm/Kbuild | 1 +
> arch/m68k/include/asm/barrier.h | 8 --------
> 2 files changed, 1 insertion(+), 8 deletions(-)
> delete mode 100644 arch/m68k/include/asm/barrier.h
>
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index df4d46fc321b..6fb9e813a910 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -1,3 +1,4 @@
> +generic-y += barrier.h
> generic-y += bitsperlong.h
> generic-y += clkdev.h
> generic-y += cputime.h
> diff --git a/arch/m68k/include/asm/barrier.h b/arch/m68k/include/asm/barrier.h
> deleted file mode 100644
> index 15c5f77c1614..000000000000
> --- a/arch/m68k/include/asm/barrier.h
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -#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 */
>

2014-02-05 01:08:54

by Greg Ungerer

Subject: Re: [PATCH 3/3] m68k: Wire up sched_setattr and sched_getattr

On 05/02/14 06:15, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Acked-by: Greg Ungerer <[email protected]>


> ---
> arch/m68k/include/asm/unistd.h | 2 +-
> arch/m68k/include/uapi/asm/unistd.h | 2 ++
> arch/m68k/kernel/syscalltable.S | 2 ++
> 3 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
> index 014f288fc813..9d38b73989eb 100644
> --- a/arch/m68k/include/asm/unistd.h
> +++ b/arch/m68k/include/asm/unistd.h
> @@ -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
> diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h
> index 625f321001dc..b932dd470041 100644
> --- a/arch/m68k/include/uapi/asm/unistd.h
> +++ b/arch/m68k/include/uapi/asm/unistd.h
> @@ -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_ */
> diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
> index 3f04ea0ab802..b6223dc41d82 100644
> --- a/arch/m68k/kernel/syscalltable.S
> +++ b/arch/m68k/kernel/syscalltable.S
> @@ -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 */
>
>