apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: use the new byteorder headers
  fbcon: Protect free_irq() by MACH_IS_ATARI check
  fbcon: remove broken mac vbl handler
  m68k: fix trigraph ignored warning in setox.S
  macfb annotations and compiler warning fix
  m68k: mac baboon interrupt enable/disable
  m68k: machw.h cleanup
  m68k: Mac via cleanup and commentry
  m68k: Reinstate mac rtc
This commit is contained in:
Linus Torvalds
2008-12-28 12:54:07 -08:00
parent 0191b625ca aa6eeeef78
commit 541ef5cbb8
18 changed files with 105 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asm-m68k/byteorder.h
+5 -11
View File
@@ -4,22 +4,16 @@
#include <asm/types.h>
#include <linux/compiler.h>
#ifdef __GNUC__
#define __BIG_ENDIAN
#define __SWAB_64_THRU_32__
static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
{
__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
return val;
}
#define __arch__swab32(x) ___arch__swab32(x)
#define __arch_swab32 __arch_swab32
#endif
#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
# define __BYTEORDER_HAS_U64__
# define __SWAB_64_THRU_32__
#endif
#include <linux/byteorder/big_endian.h>
#include <linux/byteorder.h>
#endif /* _M68K_BYTEORDER_H */
include/asm-m68k/machw.h
-22
View File
@@ -26,28 +26,6 @@
#include <linux/types.h>
#if 0
/* Mac SCSI Controller 5380 */
#define MAC_5380_BAS (0x50F10000) /* This is definitely wrong!! */
struct MAC_5380 {
u_char scsi_data;
u_char char_dummy1;
u_char scsi_icr;
u_char char_dummy2;
u_char scsi_mode;
u_char char_dummy3;
u_char scsi_tcr;
u_char char_dummy4;
u_char scsi_idstat;
u_char char_dummy5;
u_char scsi_dmastat;
u_char char_dummy6;
u_char scsi_targrcv;
u_char char_dummy7;
u_char scsi_inircv;
};
#define mac_scsi ((*(volatile struct MAC_5380 *)MAC_5380_BAS))
/*
** SCC Z8530
*/