From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH 06/11] m68k: switch to using the asm-generic sembuf.h
Date: Mon, 15 Oct 2012 16:49:14 +1000 [thread overview]
Message-ID: <1350283759-31158-7-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1350283759-31158-1-git-send-email-gerg@snapgear.com>
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/asm/sembuf.h | 25 -------------------------
2 files changed, 1 insertions(+), 25 deletions(-)
delete mode 100644 arch/m68k/include/asm/sembuf.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 775eef9..19f59dc 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -26,6 +26,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/asm/sembuf.h b/arch/m68k/include/asm/sembuf.h
deleted file mode 100644
index 2308052..0000000
--- a/arch/m68k/include/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
next prev parent reply other threads:[~2012-10-15 6:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-15 6:49 [PATCH 00/11] m68k: use asm-generic headers when possible gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 01/11] m68k: switch to using the asm-generic auxvec.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 02/11] m68k: switch to using the asm-generic hw_irq.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 03/11] m68k: switch to using the asm-generic shmparam.h gerg
2012-10-15 6:49 ` [PATCH 04/11] m68k: switch to using the asm-generic msgbuf.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 05/11] m68k: switch to using the asm-generic shmbuf.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` gerg [this message]
2012-10-15 6:49 ` [PATCH 06/11] m68k: switch to using the asm-generic sembuf.h gerg
2012-10-15 6:49 ` [PATCH 07/11] m68k: switch to using the asm-generic spinlock.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 08/11] m68k: switch to using the asm-generic termbits.h gerg
2012-10-15 6:49 ` [PATCH 09/11] m68k: switch to using the asm-generic termios.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 10/11] m68k: switch to using the asm-generic sockios.h gerg
2012-10-15 6:49 ` gerg
2012-10-15 6:49 ` [PATCH 11/11] m68k: switch to using the asm-generic socket.h gerg
2012-10-20 14:46 ` [PATCH 00/11] m68k: use asm-generic headers when possible Geert Uytterhoeven
2012-10-21 12:38 ` Greg Ungerer
2012-10-21 12:38 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350283759-31158-7-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).