mirror of
				https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
				synced 2025-10-31 05:14:38 +00:00 
			
		
		
		
	 49148020bc
			
		
	
	
		49148020bc
		
	
	
	
	
		
			
			Merge header files for m68k and m68knommu to the single location:
    arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h  [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
	BASE=${1%.h}
	git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
	git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
	git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
	git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
	git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
	mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
		
	
			
		
			
				
	
	
		
			85 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			85 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef __ARCH_M68K_IOCTLS_H__
 | |
| #define __ARCH_M68K_IOCTLS_H__
 | |
| 
 | |
| #include <asm/ioctl.h>
 | |
| 
 | |
| /* 0x54 is just a magic number to make these relatively unique ('T') */
 | |
| 
 | |
| #define TCGETS		0x5401
 | |
| #define TCSETS		0x5402
 | |
| #define TCSETSW		0x5403
 | |
| #define TCSETSF		0x5404
 | |
| #define TCGETA		0x5405
 | |
| #define TCSETA		0x5406
 | |
| #define TCSETAW		0x5407
 | |
| #define TCSETAF		0x5408
 | |
| #define TCSBRK		0x5409
 | |
| #define TCXONC		0x540A
 | |
| #define TCFLSH		0x540B
 | |
| #define TIOCEXCL	0x540C
 | |
| #define TIOCNXCL	0x540D
 | |
| #define TIOCSCTTY	0x540E
 | |
| #define TIOCGPGRP	0x540F
 | |
| #define TIOCSPGRP	0x5410
 | |
| #define TIOCOUTQ	0x5411
 | |
| #define TIOCSTI		0x5412
 | |
| #define TIOCGWINSZ	0x5413
 | |
| #define TIOCSWINSZ	0x5414
 | |
| #define TIOCMGET	0x5415
 | |
| #define TIOCMBIS	0x5416
 | |
| #define TIOCMBIC	0x5417
 | |
| #define TIOCMSET	0x5418
 | |
| #define TIOCGSOFTCAR	0x5419
 | |
| #define TIOCSSOFTCAR	0x541A
 | |
| #define FIONREAD	0x541B
 | |
| #define TIOCINQ		FIONREAD
 | |
| #define TIOCLINUX	0x541C
 | |
| #define TIOCCONS	0x541D
 | |
| #define TIOCGSERIAL	0x541E
 | |
| #define TIOCSSERIAL	0x541F
 | |
| #define TIOCPKT		0x5420
 | |
| #define FIONBIO		0x5421
 | |
| #define TIOCNOTTY	0x5422
 | |
| #define TIOCSETD	0x5423
 | |
| #define TIOCGETD	0x5424
 | |
| #define TCSBRKP		0x5425	/* Needed for POSIX tcsendbreak() */
 | |
| #define TIOCSBRK	0x5427  /* BSD compatibility */
 | |
| #define TIOCCBRK	0x5428  /* BSD compatibility */
 | |
| #define TIOCGSID	0x5429  /* Return the session ID of FD */
 | |
| #define TCGETS2		_IOR('T',0x2A, struct termios2)
 | |
| #define TCSETS2		_IOW('T',0x2B, struct termios2)
 | |
| #define TCSETSW2	_IOW('T',0x2C, struct termios2)
 | |
| #define TCSETSF2	_IOW('T',0x2D, struct termios2)
 | |
| #define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 | |
| #define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */
 | |
| 
 | |
| #define FIONCLEX	0x5450  /* these numbers need to be adjusted. */
 | |
| #define FIOCLEX		0x5451
 | |
| #define FIOASYNC	0x5452
 | |
| #define TIOCSERCONFIG	0x5453
 | |
| #define TIOCSERGWILD	0x5454
 | |
| #define TIOCSERSWILD	0x5455
 | |
| #define TIOCGLCKTRMIOS	0x5456
 | |
| #define TIOCSLCKTRMIOS	0x5457
 | |
| #define TIOCSERGSTRUCT	0x5458 /* For debugging only */
 | |
| #define TIOCSERGETLSR   0x5459 /* Get line status register */
 | |
| #define TIOCSERGETMULTI 0x545A /* Get multiport config  */
 | |
| #define TIOCSERSETMULTI 0x545B /* Set multiport config */
 | |
| 
 | |
| #define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */
 | |
| #define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */
 | |
| #define FIOQSIZE	0x545E
 | |
| 
 | |
| /* Used for packet mode */
 | |
| #define TIOCPKT_DATA		 0
 | |
| #define TIOCPKT_FLUSHREAD	 1
 | |
| #define TIOCPKT_FLUSHWRITE	 2
 | |
| #define TIOCPKT_STOP		 4
 | |
| #define TIOCPKT_START		 8
 | |
| #define TIOCPKT_NOSTOP		16
 | |
| #define TIOCPKT_DOSTOP		32
 | |
| 
 | |
| #define TIOCSER_TEMT    0x01	/* Transmitter physically empty */
 | |
| 
 | |
| #endif /* __ARCH_M68K_IOCTLS_H__ */
 |