mirror of
https://github.com/torvalds/linux.git
synced 2024-12-03 17:41:22 +00:00
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>
113 lines
3.0 KiB
C
113 lines
3.0 KiB
C
#ifndef _M68K_DMA_MAPPING_H
|
|
#define _M68K_DMA_MAPPING_H
|
|
|
|
#include <asm/cache.h>
|
|
|
|
struct scatterlist;
|
|
|
|
#ifndef CONFIG_MMU_SUN3
|
|
static inline int dma_supported(struct device *dev, u64 mask)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static inline int dma_set_mask(struct device *dev, u64 mask)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int dma_get_cache_alignment(void)
|
|
{
|
|
return 1 << L1_CACHE_SHIFT;
|
|
}
|
|
|
|
static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
extern void *dma_alloc_coherent(struct device *, size_t,
|
|
dma_addr_t *, gfp_t);
|
|
extern void dma_free_coherent(struct device *, size_t,
|
|
void *, dma_addr_t);
|
|
|
|
static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
|
|
dma_addr_t *handle, gfp_t flag)
|
|
{
|
|
return dma_alloc_coherent(dev, size, handle, flag);
|
|
}
|
|
static inline void dma_free_noncoherent(struct device *dev, size_t size,
|
|
void *addr, dma_addr_t handle)
|
|
{
|
|
dma_free_coherent(dev, size, addr, handle);
|
|
}
|
|
static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
|
|
enum dma_data_direction dir)
|
|
{
|
|
/* we use coherent allocation, so not much to do here. */
|
|
}
|
|
|
|
extern dma_addr_t dma_map_single(struct device *, void *, size_t,
|
|
enum dma_data_direction);
|
|
static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,
|
|
size_t size, enum dma_data_direction dir)
|
|
{
|
|
}
|
|
|
|
extern dma_addr_t dma_map_page(struct device *, struct page *,
|
|
unsigned long, size_t size,
|
|
enum dma_data_direction);
|
|
static inline void dma_unmap_page(struct device *dev, dma_addr_t address,
|
|
size_t size, enum dma_data_direction dir)
|
|
{
|
|
}
|
|
|
|
extern int dma_map_sg(struct device *, struct scatterlist *, int,
|
|
enum dma_data_direction);
|
|
static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
|
|
int nhwentries, enum dma_data_direction dir)
|
|
{
|
|
}
|
|
|
|
extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t,
|
|
enum dma_data_direction);
|
|
extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int,
|
|
enum dma_data_direction);
|
|
|
|
static inline void dma_sync_single_range_for_device(struct device *dev,
|
|
dma_addr_t dma_handle, unsigned long offset, size_t size,
|
|
enum dma_data_direction direction)
|
|
{
|
|
/* just sync everything for now */
|
|
dma_sync_single_for_device(dev, dma_handle, offset + size, direction);
|
|
}
|
|
|
|
static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
|
|
size_t size, enum dma_data_direction dir)
|
|
{
|
|
}
|
|
|
|
static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
|
|
int nents, enum dma_data_direction dir)
|
|
{
|
|
}
|
|
|
|
static inline void dma_sync_single_range_for_cpu(struct device *dev,
|
|
dma_addr_t dma_handle, unsigned long offset, size_t size,
|
|
enum dma_data_direction direction)
|
|
{
|
|
/* just sync everything for now */
|
|
dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction);
|
|
}
|
|
|
|
static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#else
|
|
#include <asm-generic/dma-mapping-broken.h>
|
|
#endif
|
|
|
|
#endif /* _M68K_DMA_MAPPING_H */
|