[PATCH] m68k: remove never used asm/shm.h

[PATCH] m68k: remove never used asm/shm.h

[Paul Bolle]

m68k's asm/shm.h header has been part of the tree ever since m68k
support got added in v1.3.94. (It started as /include/asm-m68k/shm.h and
moved to its current location a few years ago.) It seems it was never
used: no file ever included it and nothing used the macros it defines.

(Actually, from v2.5.46 until v2.6.29-rc3 it was included by m68knommu's
asm/shm.h. But that header was just a very thin wrapper for this header
and was itself unused too.)

This header can safely be removed.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) Tested by using various git commands on (way too much of the history
of) the tree.

1) There's an almost identical patch for h8300's asm/shm.h header.

 arch/m68k/include/asm/shm.h |   31 -------------------------------
 1 files changed, 0 insertions(+), 31 deletions(-)
 delete mode 100644 arch/m68k/include/asm/shm.h

diff --git a/arch/m68k/include/asm/shm.h b/arch/m68k/include/asm/shm.h
deleted file mode 100644
index fa56ec8..0000000
--- a/arch/m68k/include/asm/shm.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _M68K_SHM_H
-#define _M68K_SHM_H
-
-
-/* format of page table entries that correspond to shared memory pages
-   currently out in swap space (see also mm/swap.c):
-   bits 0-1 (PAGE_PRESENT) is  = 0
-   bits 8..2 (SWP_TYPE) are = SHM_SWP_TYPE
-   bits 31..9 are used like this:
-   bits 15..9 (SHM_ID) the id of the shared memory segment
-   bits 30..16 (SHM_IDX) the index of the page within the shared memory segment
-                    (actually only bits 25..16 get used since SHMMAX is so low)
-   bit 31 (SHM_READ_ONLY) flag whether the page belongs to a read-only attach
-*/
-/* on the m68k both bits 0 and 1 must be zero */
-/* format on the sun3 is similar, but bits 30, 31 are set to zero and all
-   others are reduced by 2. --m */
-
-#ifndef CONFIG_SUN3
-#define SHM_ID_SHIFT	9
-#else
-#define SHM_ID_SHIFT	7
-#endif
-#define _SHM_ID_BITS	7
-#define SHM_ID_MASK	((1<<_SHM_ID_BITS)-1)
-
-#define SHM_IDX_SHIFT	(SHM_ID_SHIFT+_SHM_ID_BITS)
-#define _SHM_IDX_BITS	15
-#define SHM_IDX_MASK	((1<<_SHM_IDX_BITS)-1)
-
-#endif /* _M68K_SHM_H */
-- 
1.7.7.6

Re: [PATCH] m68k: remove never used asm/shm.h

[Andreas Schwab]

Paul Bolle <pebolle@tiscali.nl> writes:

> m68k's asm/shm.h header has been part of the tree ever since m68k
> support got added in v1.3.94. (It started as /include/asm-m68k/shm.h and
> moved to its current location a few years ago.) It seems it was never
> used: no file ever included it and nothing used the macros it defines.

Apparently this was a precursor to what is now <asm/shmparam.h> (which
was introduced in 1.3.2).

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] m68k: remove never used asm/shm.h

[Geert Uytterhoeven]

On Fri, Jun 22, 2012 at 12:33 PM, Paul Bolle <pebolle@tiscali.nl> wrote:
> m68k's asm/shm.h header has been part of the tree ever since m68k
> support got added in v1.3.94. (It started as /include/asm-m68k/shm.h and
> moved to its current location a few years ago.) It seems it was never
> used: no file ever included it and nothing used the macros it defines.
>
> (Actually, from v2.5.46 until v2.6.29-rc3 it was included by m68knommu's
> asm/shm.h. But that header was just a very thin wrapper for this header
> and was itself unused too.)
>
> This header can safely be removed.
>
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

Thx, queued for 3.6.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds