* [PATCH v2 00/11] m68k: use asm-generic headers when possible
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h gerg
` (11 subsequent siblings)
12 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch
Quite a few of the m68k asm headers are identical to the asm-generic
versions. So switch to using them where ever we can.
v2 is rebased on top of 3.7-rc3.
All defconfigs build. Run tested on ColdFire (with and without MMU) and on
ArranyM.
---
arch/m68k/include/asm/Kbuild | 11 +
arch/m68k/include/asm/hw_irq.h | 6 -
arch/m68k/include/asm/shmparam.h | 6 -
arch/m68k/include/asm/spinlock.h | 6 -
arch/m68k/include/asm/termios.h | 50 --------
arch/m68k/include/uapi/asm/Kbuild | 8 -
arch/m68k/include/uapi/asm/auxvec.h | 4
arch/m68k/include/uapi/asm/msgbuf.h | 31 -----
arch/m68k/include/uapi/asm/sembuf.h | 25 ----
arch/m68k/include/uapi/asm/shmbuf.h | 42 -------
arch/m68k/include/uapi/asm/socket.h | 72 ------------
arch/m68k/include/uapi/asm/sockios.h | 13 --
arch/m68k/include/uapi/asm/termbits.h | 201 ----------------------------------
arch/m68k/include/uapi/asm/termios.h | 44 -------
14 files changed, 11 insertions(+), 508 deletions(-)
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
2012-10-29 5:49 ` gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h gerg
` (10 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local auxvec.h, switch the using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/auxvec.h | 4 ----
3 files changed, 1 insertions(+), 5 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 88fa3ac..009446e 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,4 +1,5 @@
+generic-y += auxvec.h
generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cputime.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 972bce1..588c3cc 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -2,7 +2,6 @@
include include/uapi/asm-generic/Kbuild.asm
header-y += a.out.h
-header-y += auxvec.h
header-y += byteorder.h
header-y += cachectl.h
header-y += fcntl.h
diff --git a/arch/m68k/include/uapi/asm/auxvec.h b/arch/m68k/include/uapi/asm/auxvec.h
deleted file mode 100644
index 844d6d5..0000000
--- a/arch/m68k/include/uapi/asm/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMm68k_AUXVEC_H
-#define __ASMm68k_AUXVEC_H
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h
2012-10-29 5:49 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local auxvec.h, switch the using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/auxvec.h | 4 ----
3 files changed, 1 insertions(+), 5 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 88fa3ac..009446e 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -1,4 +1,5 @@
+generic-y += auxvec.h
generic-y += bitsperlong.h
generic-y += clkdev.h
generic-y += cputime.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 972bce1..588c3cc 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -2,7 +2,6 @@
include include/uapi/asm-generic/Kbuild.asm
header-y += a.out.h
-header-y += auxvec.h
header-y += byteorder.h
header-y += cachectl.h
header-y += fcntl.h
diff --git a/arch/m68k/include/uapi/asm/auxvec.h b/arch/m68k/include/uapi/asm/auxvec.h
deleted file mode 100644
index 844d6d5..0000000
--- a/arch/m68k/include/uapi/asm/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMm68k_AUXVEC_H
-#define __ASMm68k_AUXVEC_H
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h gerg
` (9 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local hw_irq.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/hw_irq.h | 6 ------
2 files changed, 1 insertions(+), 6 deletions(-)
delete mode 100644 arch/m68k/include/asm/hw_irq.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 009446e..fbf0306 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -8,6 +8,7 @@ generic-y += emergency-restart.h
generic-y += errno.h
generic-y += exec.h
generic-y += futex.h
+generic-y += hw_irq.h
generic-y += ioctl.h
generic-y += ipcbuf.h
generic-y += irq_regs.h
diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h
deleted file mode 100644
index eacef09..0000000
--- a/arch/m68k/include/asm/hw_irq.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_M68K_HW_IRQ_H
-#define __ASM_M68K_HW_IRQ_H
-
-/* Dummy include. */
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h
2012-10-29 5:49 ` [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local hw_irq.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/hw_irq.h | 6 ------
2 files changed, 1 insertions(+), 6 deletions(-)
delete mode 100644 arch/m68k/include/asm/hw_irq.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 009446e..fbf0306 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -8,6 +8,7 @@ generic-y += emergency-restart.h
generic-y += errno.h
generic-y += exec.h
generic-y += futex.h
+generic-y += hw_irq.h
generic-y += ioctl.h
generic-y += ipcbuf.h
generic-y += irq_regs.h
diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h
deleted file mode 100644
index eacef09..0000000
--- a/arch/m68k/include/asm/hw_irq.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_M68K_HW_IRQ_H
-#define __ASM_M68K_HW_IRQ_H
-
-/* Dummy include. */
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (2 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h gerg
` (8 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local shmparam.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/shmparam.h | 6 ------
2 files changed, 1 insertions(+), 6 deletions(-)
delete mode 100644 arch/m68k/include/asm/shmparam.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index fbf0306..a0c4c9a 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -23,6 +23,7 @@ generic-y += percpu.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += shmparam.h
generic-y += siginfo.h
generic-y += statfs.h
generic-y += topology.h
diff --git a/arch/m68k/include/asm/shmparam.h b/arch/m68k/include/asm/shmparam.h
deleted file mode 100644
index 558892a..0000000
--- a/arch/m68k/include/asm/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68K_SHMPARAM_H
-#define _M68K_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
-
-#endif /* _M68K_SHMPARAM_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h
2012-10-29 5:49 ` [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local shmparam.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/shmparam.h | 6 ------
2 files changed, 1 insertions(+), 6 deletions(-)
delete mode 100644 arch/m68k/include/asm/shmparam.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index fbf0306..a0c4c9a 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -23,6 +23,7 @@ generic-y += percpu.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += shmparam.h
generic-y += siginfo.h
generic-y += statfs.h
generic-y += topology.h
diff --git a/arch/m68k/include/asm/shmparam.h b/arch/m68k/include/asm/shmparam.h
deleted file mode 100644
index 558892a..0000000
--- a/arch/m68k/include/asm/shmparam.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68K_SHMPARAM_H
-#define _M68K_SHMPARAM_H
-
-#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */
-
-#endif /* _M68K_SHMPARAM_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (3 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 05/11] m68k: switch to using the asm-generic shmbuf.h gerg
` (7 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local msgbuf.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/msgbuf.h | 31 -------------------------------
3 files changed, 1 insertions(+), 32 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index a0c4c9a..3144bb9 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -18,6 +18,7 @@ generic-y += kvm_para.h
generic-y += local64.h
generic-y += local.h
generic-y += mman.h
+generic-y += msgbuf.h
generic-y += mutex.h
generic-y += percpu.h
generic-y += resource.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 588c3cc..5c99e46 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -6,7 +6,6 @@ header-y += byteorder.h
header-y += cachectl.h
header-y += fcntl.h
header-y += ioctls.h
-header-y += msgbuf.h
header-y += param.h
header-y += poll.h
header-y += posix_types.h
diff --git a/arch/m68k/include/uapi/asm/msgbuf.h b/arch/m68k/include/uapi/asm/msgbuf.h
deleted file mode 100644
index 243cb79..0000000
--- a/arch/m68k/include/uapi/asm/msgbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _M68K_MSGBUF_H
-#define _M68K_MSGBUF_H
-
-/*
- * The msqid64_ds structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
- struct ipc64_perm msg_perm;
- __kernel_time_t msg_stime; /* last msgsnd time */
- unsigned long __unused1;
- __kernel_time_t msg_rtime; /* last msgrcv time */
- unsigned long __unused2;
- __kernel_time_t msg_ctime; /* last change time */
- unsigned long __unused3;
- unsigned long msg_cbytes; /* current number of bytes on queue */
- unsigned long msg_qnum; /* number of messages in queue */
- unsigned long msg_qbytes; /* max number of bytes on queue */
- __kernel_pid_t msg_lspid; /* pid of last msgsnd */
- __kernel_pid_t msg_lrpid; /* last receive pid */
- unsigned long __unused4;
- unsigned long __unused5;
-};
-
-#endif /* _M68K_MSGBUF_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h
2012-10-29 5:49 ` [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local msgbuf.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/msgbuf.h | 31 -------------------------------
3 files changed, 1 insertions(+), 32 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index a0c4c9a..3144bb9 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -18,6 +18,7 @@ generic-y += kvm_para.h
generic-y += local64.h
generic-y += local.h
generic-y += mman.h
+generic-y += msgbuf.h
generic-y += mutex.h
generic-y += percpu.h
generic-y += resource.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 588c3cc..5c99e46 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -6,7 +6,6 @@ header-y += byteorder.h
header-y += cachectl.h
header-y += fcntl.h
header-y += ioctls.h
-header-y += msgbuf.h
header-y += param.h
header-y += poll.h
header-y += posix_types.h
diff --git a/arch/m68k/include/uapi/asm/msgbuf.h b/arch/m68k/include/uapi/asm/msgbuf.h
deleted file mode 100644
index 243cb79..0000000
--- a/arch/m68k/include/uapi/asm/msgbuf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _M68K_MSGBUF_H
-#define _M68K_MSGBUF_H
-
-/*
- * The msqid64_ds structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct msqid64_ds {
- struct ipc64_perm msg_perm;
- __kernel_time_t msg_stime; /* last msgsnd time */
- unsigned long __unused1;
- __kernel_time_t msg_rtime; /* last msgrcv time */
- unsigned long __unused2;
- __kernel_time_t msg_ctime; /* last change time */
- unsigned long __unused3;
- unsigned long msg_cbytes; /* current number of bytes on queue */
- unsigned long msg_qnum; /* number of messages in queue */
- unsigned long msg_qbytes; /* max number of bytes on queue */
- __kernel_pid_t msg_lspid; /* pid of last msgsnd */
- __kernel_pid_t msg_lrpid; /* last receive pid */
- unsigned long __unused4;
- unsigned long __unused5;
-};
-
-#endif /* _M68K_MSGBUF_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 05/11] m68k: switch to using the asm-generic shmbuf.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (4 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h gerg
` (6 subsequent siblings)
12 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local shmbuf.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/shmbuf.h | 42 -----------------------------------
3 files changed, 1 insertions(+), 43 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 3144bb9..7541328 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -24,6 +24,7 @@ generic-y += percpu.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
generic-y += statfs.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 5c99e46..5d627ed 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -12,7 +12,6 @@ header-y += posix_types.h
header-y += ptrace.h
header-y += sembuf.h
header-y += setup.h
-header-y += shmbuf.h
header-y += sigcontext.h
header-y += signal.h
header-y += socket.h
diff --git a/arch/m68k/include/uapi/asm/shmbuf.h b/arch/m68k/include/uapi/asm/shmbuf.h
deleted file mode 100644
index f8928d6..0000000
--- a/arch/m68k/include/uapi/asm/shmbuf.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _M68K_SHMBUF_H
-#define _M68K_SHMBUF_H
-
-/*
- * The shmid64_ds structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct shmid64_ds {
- struct ipc64_perm shm_perm; /* operation perms */
- size_t shm_segsz; /* size of segment (bytes) */
- __kernel_time_t shm_atime; /* last attach time */
- unsigned long __unused1;
- __kernel_time_t shm_dtime; /* last detach time */
- unsigned long __unused2;
- __kernel_time_t shm_ctime; /* last change time */
- unsigned long __unused3;
- __kernel_pid_t shm_cpid; /* pid of creator */
- __kernel_pid_t shm_lpid; /* pid of last operator */
- unsigned long shm_nattch; /* no. of current attaches */
- unsigned long __unused4;
- unsigned long __unused5;
-};
-
-struct shminfo64 {
- unsigned long shmmax;
- unsigned long shmmin;
- unsigned long shmmni;
- unsigned long shmseg;
- unsigned long shmall;
- unsigned long __unused1;
- unsigned long __unused2;
- unsigned long __unused3;
- unsigned long __unused4;
-};
-
-#endif /* _M68K_SHMBUF_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (5 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 05/11] m68k: switch to using the asm-generic shmbuf.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h gerg
` (5 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local sembuf.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/sembuf.h | 25 -------------------------
3 files changed, 1 insertions(+), 26 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 7541328..86d38c0 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -24,6 +24,7 @@ generic-y += percpu.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 5d627ed..73de97a 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -10,7 +10,6 @@ header-y += param.h
header-y += poll.h
header-y += posix_types.h
header-y += ptrace.h
-header-y += sembuf.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
diff --git a/arch/m68k/include/uapi/asm/sembuf.h b/arch/m68k/include/uapi/asm/sembuf.h
deleted file mode 100644
index 2308052..0000000
--- a/arch/m68k/include/uapi/asm/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _M68K_SEMBUF_H
-#define _M68K_SEMBUF_H
-
-/*
- * The semid64_ds structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
- struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
- __kernel_time_t sem_otime; /* last semop time */
- unsigned long __unused1;
- __kernel_time_t sem_ctime; /* last change time */
- unsigned long __unused2;
- unsigned long sem_nsems; /* no. of semaphores in array */
- unsigned long __unused3;
- unsigned long __unused4;
-};
-
-#endif /* _M68K_SEMBUF_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h
2012-10-29 5:49 ` [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local sembuf.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/sembuf.h | 25 -------------------------
3 files changed, 1 insertions(+), 26 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 7541328..86d38c0 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -24,6 +24,7 @@ generic-y += percpu.h
generic-y += resource.h
generic-y += scatterlist.h
generic-y += sections.h
+generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 5d627ed..73de97a 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -10,7 +10,6 @@ header-y += param.h
header-y += poll.h
header-y += posix_types.h
header-y += ptrace.h
-header-y += sembuf.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
diff --git a/arch/m68k/include/uapi/asm/sembuf.h b/arch/m68k/include/uapi/asm/sembuf.h
deleted file mode 100644
index 2308052..0000000
--- a/arch/m68k/include/uapi/asm/sembuf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _M68K_SEMBUF_H
-#define _M68K_SEMBUF_H
-
-/*
- * The semid64_ds structure for m68k architecture.
- * Note extra padding because this structure is passed back and forth
- * between kernel and user space.
- *
- * Pad space is left for:
- * - 64-bit time_t to solve y2038 problem
- * - 2 miscellaneous 32-bit values
- */
-
-struct semid64_ds {
- struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
- __kernel_time_t sem_otime; /* last semop time */
- unsigned long __unused1;
- __kernel_time_t sem_ctime; /* last change time */
- unsigned long __unused2;
- unsigned long sem_nsems; /* no. of semaphores in array */
- unsigned long __unused3;
- unsigned long __unused4;
-};
-
-#endif /* _M68K_SEMBUF_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (6 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h gerg
` (4 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local spinlock.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/spinlock.h | 6 ------
2 files changed, 1 insertions(+), 6 deletions(-)
delete mode 100644 arch/m68k/include/asm/spinlock.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 86d38c0..64e549c 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += spinlock.h
generic-y += statfs.h
generic-y += topology.h
generic-y += types.h
diff --git a/arch/m68k/include/asm/spinlock.h b/arch/m68k/include/asm/spinlock.h
deleted file mode 100644
index 20f46e2..0000000
--- a/arch/m68k/include/asm/spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68K_SPINLOCK_H
-#define __M68K_SPINLOCK_H
-
-#error "m68k doesn't do SMP yet"
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h
2012-10-29 5:49 ` [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local spinlock.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/spinlock.h | 6 ------
2 files changed, 1 insertions(+), 6 deletions(-)
delete mode 100644 arch/m68k/include/asm/spinlock.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 86d38c0..64e549c 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += spinlock.h
generic-y += statfs.h
generic-y += topology.h
generic-y += types.h
diff --git a/arch/m68k/include/asm/spinlock.h b/arch/m68k/include/asm/spinlock.h
deleted file mode 100644
index 20f46e2..0000000
--- a/arch/m68k/include/asm/spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68K_SPINLOCK_H
-#define __M68K_SPINLOCK_H
-
-#error "m68k doesn't do SMP yet"
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (7 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 09/11] m68k: switch to using the asm-generic termios.h gerg
` (3 subsequent siblings)
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local termbits.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/termbits.h | 201 ---------------------------------
3 files changed, 1 insertions(+), 202 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 64e549c..8867342 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -30,6 +30,7 @@ generic-y += shmparam.h
generic-y += siginfo.h
generic-y += spinlock.h
generic-y += statfs.h
+generic-y += termbits.h
generic-y += topology.h
generic-y += types.h
generic-y += word-at-a-time.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 73de97a..2b774c7 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -17,6 +17,5 @@ header-y += socket.h
header-y += sockios.h
header-y += stat.h
header-y += swab.h
-header-y += termbits.h
header-y += termios.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/termbits.h b/arch/m68k/include/uapi/asm/termbits.h
deleted file mode 100644
index aea1e37..0000000
--- a/arch/m68k/include/uapi/asm/termbits.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef __ARCH_M68K_TERMBITS_H__
-#define __ARCH_M68K_TERMBITS_H__
-
-#include <linux/posix_types.h>
-
-typedef unsigned char cc_t;
-typedef unsigned int speed_t;
-typedef unsigned int tcflag_t;
-
-#define NCCS 19
-struct termios {
- tcflag_t c_iflag; /* input mode flags */
- tcflag_t c_oflag; /* output mode flags */
- tcflag_t c_cflag; /* control mode flags */
- tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
- cc_t c_cc[NCCS]; /* control characters */
-};
-
-struct termios2 {
- tcflag_t c_iflag; /* input mode flags */
- tcflag_t c_oflag; /* output mode flags */
- tcflag_t c_cflag; /* control mode flags */
- tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
- cc_t c_cc[NCCS]; /* control characters */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
-struct ktermios {
- tcflag_t c_iflag; /* input mode flags */
- tcflag_t c_oflag; /* output mode flags */
- tcflag_t c_cflag; /* control mode flags */
- tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
- cc_t c_cc[NCCS]; /* control characters */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-
-/* c_iflag bits */
-#define IGNBRK 0000001
-#define BRKINT 0000002
-#define IGNPAR 0000004
-#define PARMRK 0000010
-#define INPCK 0000020
-#define ISTRIP 0000040
-#define INLCR 0000100
-#define IGNCR 0000200
-#define ICRNL 0000400
-#define IUCLC 0001000
-#define IXON 0002000
-#define IXANY 0004000
-#define IXOFF 0010000
-#define IMAXBEL 0020000
-#define IUTF8 0040000
-
-/* c_oflag bits */
-#define OPOST 0000001
-#define OLCUC 0000002
-#define ONLCR 0000004
-#define OCRNL 0000010
-#define ONOCR 0000020
-#define ONLRET 0000040
-#define OFILL 0000100
-#define OFDEL 0000200
-#define NLDLY 0000400
-#define NL0 0000000
-#define NL1 0000400
-#define CRDLY 0003000
-#define CR0 0000000
-#define CR1 0001000
-#define CR2 0002000
-#define CR3 0003000
-#define TABDLY 0014000
-#define TAB0 0000000
-#define TAB1 0004000
-#define TAB2 0010000
-#define TAB3 0014000
-#define XTABS 0014000
-#define BSDLY 0020000
-#define BS0 0000000
-#define BS1 0020000
-#define VTDLY 0040000
-#define VT0 0000000
-#define VT1 0040000
-#define FFDLY 0100000
-#define FF0 0000000
-#define FF1 0100000
-
-/* c_cflag bit meaning */
-#define CBAUD 0010017
-#define B0 0000000 /* hang up */
-#define B50 0000001
-#define B75 0000002
-#define B110 0000003
-#define B134 0000004
-#define B150 0000005
-#define B200 0000006
-#define B300 0000007
-#define B600 0000010
-#define B1200 0000011
-#define B1800 0000012
-#define B2400 0000013
-#define B4800 0000014
-#define B9600 0000015
-#define B19200 0000016
-#define B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE 0000060
-#define CS5 0000000
-#define CS6 0000020
-#define CS7 0000040
-#define CS8 0000060
-#define CSTOPB 0000100
-#define CREAD 0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL 0002000
-#define CLOCAL 0004000
-#define CBAUDEX 0010000
-#define BOTHER 0010000
-#define B57600 0010001
-#define B115200 0010002
-#define B230400 0010003
-#define B460800 0010004
-#define B500000 0010005
-#define B576000 0010006
-#define B921600 0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-#define CIBAUD 002003600000 /* input baud rate */
-#define CMSPAR 010000000000 /* mark or space (stick) parity */
-#define CRTSCTS 020000000000 /* flow control */
-
-#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG 0000001
-#define ICANON 0000002
-#define XCASE 0000004
-#define ECHO 0000010
-#define ECHOE 0000020
-#define ECHOK 0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-#define IEXTEN 0100000
-#define EXTPROC 0200000
-
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF 0
-#define TCOON 1
-#define TCIOFF 2
-#define TCION 3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH 0
-#define TCOFLUSH 1
-#define TCIOFLUSH 2
-
-/* tcsetattr uses these */
-#define TCSANOW 0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#endif /* __ARCH_M68K_TERMBITS_H__ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h
2012-10-29 5:49 ` [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local termbits.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/termbits.h | 201 ---------------------------------
3 files changed, 1 insertions(+), 202 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 64e549c..8867342 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -30,6 +30,7 @@ generic-y += shmparam.h
generic-y += siginfo.h
generic-y += spinlock.h
generic-y += statfs.h
+generic-y += termbits.h
generic-y += topology.h
generic-y += types.h
generic-y += word-at-a-time.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 73de97a..2b774c7 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -17,6 +17,5 @@ header-y += socket.h
header-y += sockios.h
header-y += stat.h
header-y += swab.h
-header-y += termbits.h
header-y += termios.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/termbits.h b/arch/m68k/include/uapi/asm/termbits.h
deleted file mode 100644
index aea1e37..0000000
--- a/arch/m68k/include/uapi/asm/termbits.h
+++ /dev/null
@@ -1,201 +0,0 @@
-#ifndef __ARCH_M68K_TERMBITS_H__
-#define __ARCH_M68K_TERMBITS_H__
-
-#include <linux/posix_types.h>
-
-typedef unsigned char cc_t;
-typedef unsigned int speed_t;
-typedef unsigned int tcflag_t;
-
-#define NCCS 19
-struct termios {
- tcflag_t c_iflag; /* input mode flags */
- tcflag_t c_oflag; /* output mode flags */
- tcflag_t c_cflag; /* control mode flags */
- tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
- cc_t c_cc[NCCS]; /* control characters */
-};
-
-struct termios2 {
- tcflag_t c_iflag; /* input mode flags */
- tcflag_t c_oflag; /* output mode flags */
- tcflag_t c_cflag; /* control mode flags */
- tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
- cc_t c_cc[NCCS]; /* control characters */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
-struct ktermios {
- tcflag_t c_iflag; /* input mode flags */
- tcflag_t c_oflag; /* output mode flags */
- tcflag_t c_cflag; /* control mode flags */
- tcflag_t c_lflag; /* local mode flags */
- cc_t c_line; /* line discipline */
- cc_t c_cc[NCCS]; /* control characters */
- speed_t c_ispeed; /* input speed */
- speed_t c_ospeed; /* output speed */
-};
-
-/* c_cc characters */
-#define VINTR 0
-#define VQUIT 1
-#define VERASE 2
-#define VKILL 3
-#define VEOF 4
-#define VTIME 5
-#define VMIN 6
-#define VSWTC 7
-#define VSTART 8
-#define VSTOP 9
-#define VSUSP 10
-#define VEOL 11
-#define VREPRINT 12
-#define VDISCARD 13
-#define VWERASE 14
-#define VLNEXT 15
-#define VEOL2 16
-
-
-/* c_iflag bits */
-#define IGNBRK 0000001
-#define BRKINT 0000002
-#define IGNPAR 0000004
-#define PARMRK 0000010
-#define INPCK 0000020
-#define ISTRIP 0000040
-#define INLCR 0000100
-#define IGNCR 0000200
-#define ICRNL 0000400
-#define IUCLC 0001000
-#define IXON 0002000
-#define IXANY 0004000
-#define IXOFF 0010000
-#define IMAXBEL 0020000
-#define IUTF8 0040000
-
-/* c_oflag bits */
-#define OPOST 0000001
-#define OLCUC 0000002
-#define ONLCR 0000004
-#define OCRNL 0000010
-#define ONOCR 0000020
-#define ONLRET 0000040
-#define OFILL 0000100
-#define OFDEL 0000200
-#define NLDLY 0000400
-#define NL0 0000000
-#define NL1 0000400
-#define CRDLY 0003000
-#define CR0 0000000
-#define CR1 0001000
-#define CR2 0002000
-#define CR3 0003000
-#define TABDLY 0014000
-#define TAB0 0000000
-#define TAB1 0004000
-#define TAB2 0010000
-#define TAB3 0014000
-#define XTABS 0014000
-#define BSDLY 0020000
-#define BS0 0000000
-#define BS1 0020000
-#define VTDLY 0040000
-#define VT0 0000000
-#define VT1 0040000
-#define FFDLY 0100000
-#define FF0 0000000
-#define FF1 0100000
-
-/* c_cflag bit meaning */
-#define CBAUD 0010017
-#define B0 0000000 /* hang up */
-#define B50 0000001
-#define B75 0000002
-#define B110 0000003
-#define B134 0000004
-#define B150 0000005
-#define B200 0000006
-#define B300 0000007
-#define B600 0000010
-#define B1200 0000011
-#define B1800 0000012
-#define B2400 0000013
-#define B4800 0000014
-#define B9600 0000015
-#define B19200 0000016
-#define B38400 0000017
-#define EXTA B19200
-#define EXTB B38400
-#define CSIZE 0000060
-#define CS5 0000000
-#define CS6 0000020
-#define CS7 0000040
-#define CS8 0000060
-#define CSTOPB 0000100
-#define CREAD 0000200
-#define PARENB 0000400
-#define PARODD 0001000
-#define HUPCL 0002000
-#define CLOCAL 0004000
-#define CBAUDEX 0010000
-#define BOTHER 0010000
-#define B57600 0010001
-#define B115200 0010002
-#define B230400 0010003
-#define B460800 0010004
-#define B500000 0010005
-#define B576000 0010006
-#define B921600 0010007
-#define B1000000 0010010
-#define B1152000 0010011
-#define B1500000 0010012
-#define B2000000 0010013
-#define B2500000 0010014
-#define B3000000 0010015
-#define B3500000 0010016
-#define B4000000 0010017
-#define CIBAUD 002003600000 /* input baud rate */
-#define CMSPAR 010000000000 /* mark or space (stick) parity */
-#define CRTSCTS 020000000000 /* flow control */
-
-#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */
-
-/* c_lflag bits */
-#define ISIG 0000001
-#define ICANON 0000002
-#define XCASE 0000004
-#define ECHO 0000010
-#define ECHOE 0000020
-#define ECHOK 0000040
-#define ECHONL 0000100
-#define NOFLSH 0000200
-#define TOSTOP 0000400
-#define ECHOCTL 0001000
-#define ECHOPRT 0002000
-#define ECHOKE 0004000
-#define FLUSHO 0010000
-#define PENDIN 0040000
-#define IEXTEN 0100000
-#define EXTPROC 0200000
-
-
-/* tcflow() and TCXONC use these */
-#define TCOOFF 0
-#define TCOON 1
-#define TCIOFF 2
-#define TCION 3
-
-/* tcflush() and TCFLSH use these */
-#define TCIFLUSH 0
-#define TCOFLUSH 1
-#define TCIOFLUSH 2
-
-/* tcsetattr uses these */
-#define TCSANOW 0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-#endif /* __ARCH_M68K_TERMBITS_H__ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 09/11] m68k: switch to using the asm-generic termios.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (8 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h gerg
` (2 subsequent siblings)
12 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local termios.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/termios.h | 50 ----------------------------------
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/termios.h | 44 -----------------------------
4 files changed, 1 insertions(+), 95 deletions(-)
delete mode 100644 arch/m68k/include/asm/termios.h
delete mode 100644 arch/m68k/include/uapi/asm/termios.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 8867342..63ed062 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -31,6 +31,7 @@ generic-y += siginfo.h
generic-y += spinlock.h
generic-y += statfs.h
generic-y += termbits.h
+generic-y += termios.h
generic-y += topology.h
generic-y += types.h
generic-y += word-at-a-time.h
diff --git a/arch/m68k/include/asm/termios.h b/arch/m68k/include/asm/termios.h
deleted file mode 100644
index ad8efb0..0000000
--- a/arch/m68k/include/asm/termios.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef _M68K_TERMIOS_H
-#define _M68K_TERMIOS_H
-
-#include <uapi/asm/termios.h>
-
-/* intr=^C quit=^| erase=del kill=^U
- eof=^D vtime=\0 vmin=\1 sxtc=\0
- start=^Q stop=^S susp=^Z eol=\0
- reprint=^R discard=^U werase=^W lnext=^V
- eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
- unsigned short tmp; \
- get_user(tmp, &(termio)->c_iflag); \
- (termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
- get_user(tmp, &(termio)->c_oflag); \
- (termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
- get_user(tmp, &(termio)->c_cflag); \
- (termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
- get_user(tmp, &(termio)->c_lflag); \
- (termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
- get_user((termios)->c_line, &(termio)->c_line); \
- copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
- put_user((termios)->c_iflag, &(termio)->c_iflag); \
- put_user((termios)->c_oflag, &(termio)->c_oflag); \
- put_user((termios)->c_cflag, &(termio)->c_cflag); \
- put_user((termios)->c_lflag, &(termio)->c_lflag); \
- put_user((termios)->c_line, &(termio)->c_line); \
- copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif /* _M68K_TERMIOS_H */
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 2b774c7..19bd052 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -17,5 +17,4 @@ header-y += socket.h
header-y += sockios.h
header-y += stat.h
header-y += swab.h
-header-y += termios.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/termios.h b/arch/m68k/include/uapi/asm/termios.h
deleted file mode 100644
index ce2142c..0000000
--- a/arch/m68k/include/uapi/asm/termios.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _UAPI_M68K_TERMIOS_H
-#define _UAPI_M68K_TERMIOS_H
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
- unsigned short ws_row;
- unsigned short ws_col;
- unsigned short ws_xpixel;
- unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
- unsigned short c_iflag; /* input mode flags */
- unsigned short c_oflag; /* output mode flags */
- unsigned short c_cflag; /* control mode flags */
- unsigned short c_lflag; /* local mode flags */
- unsigned char c_line; /* line discipline */
- unsigned char c_cc[NCC]; /* control characters */
-};
-
-
-/* modem lines */
-#define TIOCM_LE 0x001
-#define TIOCM_DTR 0x002
-#define TIOCM_RTS 0x004
-#define TIOCM_ST 0x008
-#define TIOCM_SR 0x010
-#define TIOCM_CTS 0x020
-#define TIOCM_CAR 0x040
-#define TIOCM_RNG 0x080
-#define TIOCM_DSR 0x100
-#define TIOCM_CD TIOCM_CAR
-#define TIOCM_RI TIOCM_RNG
-#define TIOCM_OUT1 0x2000
-#define TIOCM_OUT2 0x4000
-#define TIOCM_LOOP 0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-
-#endif /* _UAPI_M68K_TERMIOS_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (9 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 09/11] m68k: switch to using the asm-generic termios.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h gerg
2012-10-29 10:42 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h David Howells
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local sockios.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/sockios.h | 13 -------------
3 files changed, 1 insertions(+), 14 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 63ed062..2801fd5 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += sockios.h
generic-y += spinlock.h
generic-y += statfs.h
generic-y += termbits.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 19bd052..1e2314e 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -14,7 +14,6 @@ header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
header-y += socket.h
-header-y += sockios.h
header-y += stat.h
header-y += swab.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/sockios.h b/arch/m68k/include/uapi/asm/sockios.h
deleted file mode 100644
index c04a239..0000000
--- a/arch/m68k/include/uapi/asm/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ARCH_M68K_SOCKIOS__
-#define __ARCH_M68K_SOCKIOS__
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN 0x8901
-#define SIOCSPGRP 0x8902
-#define FIOGETOWN 0x8903
-#define SIOCGPGRP 0x8904
-#define SIOCATMARK 0x8905
-#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
-#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
-
-#endif /* __ARCH_M68K_SOCKIOS__ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h
2012-10-29 5:49 ` [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local sockios.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/sockios.h | 13 -------------
3 files changed, 1 insertions(+), 14 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 63ed062..2801fd5 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += sockios.h
generic-y += spinlock.h
generic-y += statfs.h
generic-y += termbits.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 19bd052..1e2314e 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -14,7 +14,6 @@ header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
header-y += socket.h
-header-y += sockios.h
header-y += stat.h
header-y += swab.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/sockios.h b/arch/m68k/include/uapi/asm/sockios.h
deleted file mode 100644
index c04a239..0000000
--- a/arch/m68k/include/uapi/asm/sockios.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ARCH_M68K_SOCKIOS__
-#define __ARCH_M68K_SOCKIOS__
-
-/* Socket-level I/O control calls. */
-#define FIOSETOWN 0x8901
-#define SIOCSPGRP 0x8902
-#define FIOGETOWN 0x8903
-#define SIOCGPGRP 0x8904
-#define SIOCATMARK 0x8905
-#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */
-#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */
-
-#endif /* __ARCH_M68K_SOCKIOS__ */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (10 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h gerg
@ 2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg
2012-10-29 10:42 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h David Howells
12 siblings, 1 reply; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local socket.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/socket.h | 72 -----------------------------------
3 files changed, 1 insertions(+), 73 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/socket.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 2801fd5..fe821a2 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += socket.h
generic-y += sockios.h
generic-y += spinlock.h
generic-y += statfs.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 1e2314e..aebdbf5 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -13,7 +13,6 @@ header-y += ptrace.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
-header-y += socket.h
header-y += stat.h
header-y += swab.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/socket.h b/arch/m68k/include/uapi/asm/socket.h
deleted file mode 100644
index d1be684..0000000
--- a/arch/m68k/include/uapi/asm/socket.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET 1
-
-#define SO_DEBUG 1
-#define SO_REUSEADDR 2
-#define SO_TYPE 3
-#define SO_ERROR 4
-#define SO_DONTROUTE 5
-#define SO_BROADCAST 6
-#define SO_SNDBUF 7
-#define SO_RCVBUF 8
-#define SO_SNDBUFFORCE 32
-#define SO_RCVBUFFORCE 33
-#define SO_KEEPALIVE 9
-#define SO_OOBINLINE 10
-#define SO_NO_CHECK 11
-#define SO_PRIORITY 12
-#define SO_LINGER 13
-#define SO_BSDCOMPAT 14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED 16
-#define SO_PEERCRED 17
-#define SO_RCVLOWAT 18
-#define SO_SNDLOWAT 19
-#define SO_RCVTIMEO 20
-#define SO_SNDTIMEO 21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION 22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
-#define SO_SECURITY_ENCRYPTION_NETWORK 24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER 26
-#define SO_DETACH_FILTER 27
-
-#define SO_PEERNAME 28
-#define SO_TIMESTAMP 29
-#define SCM_TIMESTAMP SO_TIMESTAMP
-
-#define SO_ACCEPTCONN 30
-
-#define SO_PEERSEC 31
-#define SO_PASSSEC 34
-#define SO_TIMESTAMPNS 35
-#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
-
-#define SO_MARK 36
-
-#define SO_TIMESTAMPING 37
-#define SCM_TIMESTAMPING SO_TIMESTAMPING
-
-#define SO_PROTOCOL 38
-#define SO_DOMAIN 39
-
-#define SO_RXQ_OVFL 40
-
-#define SO_WIFI_STATUS 41
-#define SCM_WIFI_STATUS SO_WIFI_STATUS
-#define SO_PEEK_OFF 42
-
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS 43
-
-#endif /* _ASM_SOCKET_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h
2012-10-29 5:49 ` [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h gerg
@ 2012-10-29 5:49 ` gerg
0 siblings, 0 replies; 25+ messages in thread
From: gerg @ 2012-10-29 5:49 UTC (permalink / raw)
To: linux-m68k, linux-arch; +Cc: Greg Ungerer
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local socket.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/socket.h | 72 -----------------------------------
3 files changed, 1 insertions(+), 73 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/socket.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 2801fd5..fe821a2 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -28,6 +28,7 @@ generic-y += sembuf.h
generic-y += shmbuf.h
generic-y += shmparam.h
generic-y += siginfo.h
+generic-y += socket.h
generic-y += sockios.h
generic-y += spinlock.h
generic-y += statfs.h
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 1e2314e..aebdbf5 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -13,7 +13,6 @@ header-y += ptrace.h
header-y += setup.h
header-y += sigcontext.h
header-y += signal.h
-header-y += socket.h
header-y += stat.h
header-y += swab.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/socket.h b/arch/m68k/include/uapi/asm/socket.h
deleted file mode 100644
index d1be684..0000000
--- a/arch/m68k/include/uapi/asm/socket.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET 1
-
-#define SO_DEBUG 1
-#define SO_REUSEADDR 2
-#define SO_TYPE 3
-#define SO_ERROR 4
-#define SO_DONTROUTE 5
-#define SO_BROADCAST 6
-#define SO_SNDBUF 7
-#define SO_RCVBUF 8
-#define SO_SNDBUFFORCE 32
-#define SO_RCVBUFFORCE 33
-#define SO_KEEPALIVE 9
-#define SO_OOBINLINE 10
-#define SO_NO_CHECK 11
-#define SO_PRIORITY 12
-#define SO_LINGER 13
-#define SO_BSDCOMPAT 14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED 16
-#define SO_PEERCRED 17
-#define SO_RCVLOWAT 18
-#define SO_SNDLOWAT 19
-#define SO_RCVTIMEO 20
-#define SO_SNDTIMEO 21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION 22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
-#define SO_SECURITY_ENCRYPTION_NETWORK 24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER 26
-#define SO_DETACH_FILTER 27
-
-#define SO_PEERNAME 28
-#define SO_TIMESTAMP 29
-#define SCM_TIMESTAMP SO_TIMESTAMP
-
-#define SO_ACCEPTCONN 30
-
-#define SO_PEERSEC 31
-#define SO_PASSSEC 34
-#define SO_TIMESTAMPNS 35
-#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
-
-#define SO_MARK 36
-
-#define SO_TIMESTAMPING 37
-#define SCM_TIMESTAMPING SO_TIMESTAMPING
-
-#define SO_PROTOCOL 38
-#define SO_DOMAIN 39
-
-#define SO_RXQ_OVFL 40
-
-#define SO_WIFI_STATUS 41
-#define SCM_WIFI_STATUS SO_WIFI_STATUS
-#define SO_PEEK_OFF 42
-
-/* Instruct lower device to use last 4-bytes of skb data as FCS */
-#define SO_NOFCS 43
-
-#endif /* _ASM_SOCKET_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
` (11 preceding siblings ...)
2012-10-29 5:49 ` [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h gerg
@ 2012-10-29 10:42 ` David Howells
2012-10-29 10:42 ` David Howells
2012-10-30 6:21 ` Greg Ungerer
12 siblings, 2 replies; 25+ messages in thread
From: David Howells @ 2012-10-29 10:42 UTC (permalink / raw)
To: gerg; +Cc: dhowells, linux-m68k, linux-arch, Greg Ungerer
<gerg@snapgear.com> wrote:
> diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
> index 972bce1..588c3cc 100644
> --- a/arch/m68k/include/uapi/asm/Kbuild
> +++ b/arch/m68k/include/uapi/asm/Kbuild
> @@ -2,7 +2,6 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> header-y += a.out.h
> -header-y += auxvec.h
> header-y += byteorder.h
> header-y += cachectl.h
> header-y += fcntl.h
Rather than removing header-y from the uapi Kbuild, you probably want to add a
generic-y there.
David
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h
2012-10-29 10:42 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h David Howells
@ 2012-10-29 10:42 ` David Howells
2012-10-30 6:21 ` Greg Ungerer
1 sibling, 0 replies; 25+ messages in thread
From: David Howells @ 2012-10-29 10:42 UTC (permalink / raw)
To: gerg; +Cc: dhowells, linux-m68k, linux-arch, Greg Ungerer
<gerg@snapgear.com> wrote:
> diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
> index 972bce1..588c3cc 100644
> --- a/arch/m68k/include/uapi/asm/Kbuild
> +++ b/arch/m68k/include/uapi/asm/Kbuild
> @@ -2,7 +2,6 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> header-y += a.out.h
> -header-y += auxvec.h
> header-y += byteorder.h
> header-y += cachectl.h
> header-y += fcntl.h
Rather than removing header-y from the uapi Kbuild, you probably want to add a
generic-y there.
David
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h
2012-10-29 10:42 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h David Howells
2012-10-29 10:42 ` David Howells
@ 2012-10-30 6:21 ` Greg Ungerer
1 sibling, 0 replies; 25+ messages in thread
From: Greg Ungerer @ 2012-10-30 6:21 UTC (permalink / raw)
To: David Howells; +Cc: linux-m68k, linux-arch, Greg Ungerer
Hi David,
On 29/10/12 20:42, David Howells wrote:
> <gerg@snapgear.com> wrote:
>
>> diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
>> index 972bce1..588c3cc 100644
>> --- a/arch/m68k/include/uapi/asm/Kbuild
>> +++ b/arch/m68k/include/uapi/asm/Kbuild
>> @@ -2,7 +2,6 @@
>> include include/uapi/asm-generic/Kbuild.asm
>>
>> header-y += a.out.h
>> -header-y += auxvec.h
>> header-y += byteorder.h
>> header-y += cachectl.h
>> header-y += fcntl.h
>
> Rather than removing header-y from the uapi Kbuild, you probably want to add a
> generic-y there.
Ok, will do. v3 coming up.
Thanks
Greg
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply [flat|nested] 25+ messages in thread