Skip to content

Commit

Permalink
sparc: when header files are equal use asm-sparc version
Browse files Browse the repository at this point in the history
Used the following script to find equal header files:
SPARC64=`ls asm-sparc64`
for FILE in ${SPARC64}; do
	cmp -s asm-sparc/$FILE asm-sparc64/$FILE;
	if [ $? = 0 ]; then
		printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE
	fi
done

A few of the equal files are a simple include from
asm-generic, but by including the file from asm-sparc
we know they are equal for sparc and sparc64.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Jul 18, 2008
1 parent a00736e commit 075ae52
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 76 deletions.
2 changes: 1 addition & 1 deletion include/asm-sparc64/irq_regs.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include <asm-generic/irq_regs.h>
#include <asm-sparc/irq_regs.h>
7 changes: 1 addition & 6 deletions include/asm-sparc64/linkage.h
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
#ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H

/* Nothing to see here... */

#endif
#include <asm-sparc/linkage.h>
10 changes: 1 addition & 9 deletions include/asm-sparc64/mutex.h
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
/*
* Pull in the generic implementation for the mutex fastpath.
*
* TODO: implement optimized primitives instead, or leave the generic
* implementation in place, or pick the atomic_xchg() based generic
* implementation. (see asm-generic/mutex-xchg.h for details)
*/

#include <asm-generic/mutex-dec.h>
#include <asm-sparc/mutex.h>
27 changes: 1 addition & 26 deletions include/asm-sparc64/rtc.h
Original file line number Diff line number Diff line change
@@ -1,26 +1 @@
/*
* rtc.h: Definitions for access to the Mostek real time clock
*
* Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
*/

#ifndef _RTC_H
#define _RTC_H

#include <linux/ioctl.h>

struct rtc_time
{
int sec; /* Seconds (0-59) */
int min; /* Minutes (0-59) */
int hour; /* Hour (0-23) */
int dow; /* Day of the week (1-7) */
int dom; /* Day of the month (1-31) */
int month; /* Month of year (1-12) */
int year; /* Year (0-99) */
};

#define RTCGET _IOR('p', 20, struct rtc_time)
#define RTCSET _IOW('p', 21, struct rtc_time)

#endif
#include <asm-sparc/rtc.h>
2 changes: 1 addition & 1 deletion include/asm-sparc64/semaphore.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include <linux/semaphore.h>
#include <asm-sparc/semaphore.h>
34 changes: 1 addition & 33 deletions include/asm-sparc64/vga.h
Original file line number Diff line number Diff line change
@@ -1,33 +1 @@
/*
* Access to VGA videoram
*
* (c) 1998 Martin Mares <mj@ucw.cz>
*/

#ifndef _LINUX_ASM_VGA_H_
#define _LINUX_ASM_VGA_H_

#include <asm/types.h>

#define VT_BUF_HAVE_RW

#undef scr_writew
#undef scr_readw

static inline void scr_writew(u16 val, u16 *addr)
{
BUG_ON((long) addr >= 0);

*addr = val;
}

static inline u16 scr_readw(const u16 *addr)
{
BUG_ON((long) addr >= 0);

return *addr;
}

#define VGA_MAP_MEM(x,s) (x)

#endif
#include <asm-sparc/vga.h>

0 comments on commit 075ae52

Please sign in to comment.