diff options
Diffstat (limited to 'sys/arch/hppa64')
-rw-r--r-- | sys/arch/hppa64/conf/GENERIC | 3 | ||||
-rw-r--r-- | sys/arch/hppa64/conf/files.hppa64 | 9 | ||||
-rw-r--r-- | sys/arch/hppa64/hppa64/locore.S | 9 |
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index f5036423322..3eb938931a7 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.20 2010/08/02 14:13:23 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.21 2010/08/18 21:01:14 jasper Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -16,7 +16,6 @@ maxusers 80 # estimated number of users option DEBUG option USER_PCICONF # user-space PCI configuration -#option COMPAT_LINUX #option PROCFS # /proc config bsd swap generic diff --git a/sys/arch/hppa64/conf/files.hppa64 b/sys/arch/hppa64/conf/files.hppa64 index 7760eadab37..10b29bce0f1 100644 --- a/sys/arch/hppa64/conf/files.hppa64 +++ b/sys/arch/hppa64/conf/files.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.hppa64,v 1.11 2010/07/01 03:44:35 jsing Exp $ +# $OpenBSD: files.hppa64,v 1.12 2010/08/18 21:01:14 jasper Exp $ # # hppa64-specific configuration info @@ -107,13 +107,6 @@ major {rd = 3} include "dev/pckbc/files.pckbc" # -# Compatibility -# -#include "compat/linux/files.linux" -#include "compat/ossaudio/files.ossaudio" -#file arch/hppa64/hppa64/linux_machdep.c compat_linux - -# # Non-device files # diff --git a/sys/arch/hppa64/hppa64/locore.S b/sys/arch/hppa64/hppa64/locore.S index 1be0fa6eaeb..316720017db 100644 --- a/sys/arch/hppa64/hppa64/locore.S +++ b/sys/arch/hppa64/hppa64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.9 2008/07/28 19:08:46 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.10 2010/08/18 21:01:14 jasper Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -363,13 +363,6 @@ gateway_page nop .align 256 -#ifdef COMPAT_LINUX - gate,n $linux_syscall, %r0 /* TODO linux syscall fix */ - nop - -$linux_syscall - nop -#endif $bsd_syscall mfctl %eiem, %r1 |