]> git.saurik.com Git - apple/xnu.git/commitdiff
xnu-1228.0.2.tar.gz mac-os-x-1051 v1228.0.2
authorApple <opensource@apple.com>
Sat, 5 Jan 2008 02:34:23 +0000 (02:34 +0000)
committerApple <opensource@apple.com>
Sat, 5 Jan 2008 02:34:23 +0000 (02:34 +0000)
109 files changed:
EXTERNAL_HEADERS/machine/limits.h
bsd/dev/dtrace/dtrace.c
bsd/dev/dtrace/profile_prvd.c
bsd/dev/dtrace/systrace.c
bsd/kern/kern_core.c
bsd/kern/kern_mib.c
bsd/kern/pthread_synch.c
bsd/libkern/libkern.h
bsd/machine/_limits.h
bsd/machine/_param.h
bsd/machine/_structs.h
bsd/machine/_types.h
bsd/machine/cons.h
bsd/machine/disklabel.h
bsd/machine/endian.h
bsd/machine/exec.h
bsd/machine/fasttrap_isa.h
bsd/machine/param.h
bsd/machine/profile.h
bsd/machine/psl.h
bsd/machine/ptrace.h
bsd/machine/reboot.h
bsd/machine/reg.h
bsd/machine/setjmp.h
bsd/machine/signal.h
bsd/machine/types.h
bsd/machine/ucontext.h
bsd/machine/vmparam.h
bsd/net/ether_if_module.c
bsd/net/ether_inet_pr_module.c
bsd/nfs/nfs_bio.c
bsd/nfs/nfs_socket.c
bsd/sys/dtrace.h
bsd/sys/fasttrap_impl.h
bsd/sys/fbt.h
bsd/sys/mcache.h
bsd/vfs/vfs_journal.c
config/MasterVersion
iokit/IOKit/machine/IOSharedLockImp.h
iokit/Kernel/IOHibernateIO.cpp
iokit/Kernel/IOHibernateRestoreKernel.c
iokit/Kernel/IOWorkLoop.cpp
libkern/gen/OSDebug.cpp
libkern/libkern/OSAtomic.h
libkern/libkern/OSByteOrder.h
libkern/libkern/_OSByteOrder.h
libsa/libsa/setjmp.h
libsyscall/custom/SYS.h
libsyscall/custom/__fork.s
libsyscall/custom/__getpid.s
libsyscall/custom/__gettimeofday.s
libsyscall/custom/__lseek.s
libsyscall/custom/__pipe.s
libsyscall/custom/__ptrace.s
libsyscall/custom/__sigaltstack.s
libsyscall/custom/__sigreturn.s
libsyscall/custom/__syscall.s
libsyscall/custom/__vfork.s
libsyscall/custom/custom.s
osfmk/chud/chud_thread.c
osfmk/chud/chud_xnu_glue.h
osfmk/chud/chud_xnu_private.h
osfmk/device/iokit_rpc.c
osfmk/kern/syscall_sw.h
osfmk/libsa/machine/types.h
osfmk/mach/machine/asm.h
osfmk/mach/machine/boolean.h
osfmk/mach/machine/exception.h
osfmk/mach/machine/kern_return.h
osfmk/mach/machine/ndr_def.h
osfmk/mach/machine/processor_info.h
osfmk/mach/machine/rpc.h
osfmk/mach/machine/sdt_isa.h
osfmk/mach/machine/syscall_sw.h
osfmk/mach/machine/thread_state.h
osfmk/mach/machine/thread_status.h
osfmk/mach/machine/vm_param.h
osfmk/mach/machine/vm_types.h
osfmk/machine/asm.h
osfmk/machine/ast.h
osfmk/machine/ast_types.h
osfmk/machine/commpage.h
osfmk/machine/cpu_affinity.h
osfmk/machine/cpu_capabilities.h
osfmk/machine/cpu_data.h
osfmk/machine/cpu_number.h
osfmk/machine/db_machdep.h
osfmk/machine/endian.h
osfmk/machine/io_map_entries.h
osfmk/machine/lock.h
osfmk/machine/locks.h
osfmk/machine/machine_cpu.h
osfmk/machine/machine_routines.h
osfmk/machine/machine_rpc.h
osfmk/machine/machlimits.h
osfmk/machine/machparam.h
osfmk/machine/pmap.h
osfmk/machine/sched_param.h
osfmk/machine/setjmp.h
osfmk/machine/simple_lock.h
osfmk/machine/task.h
osfmk/machine/thread.h
osfmk/machine/timer.h
osfmk/machine/trap.h
osfmk/machine/vm_tuning.h
osfmk/machine/xpr.h
osfmk/profiling/machine/profile-md.h
pexpert/pexpert/machine/boot.h
pexpert/pexpert/machine/protos.h

index 65bd3749409e5bba186560ba40573e525592822f..4ab4a836dc2c1c075714ac12a3606e99230ed370 100644 (file)
@@ -30,8 +30,6 @@
 #include <ppc/limits.h>
 #elif defined (__i386__)
 #include <i386/limits.h>
-#elif defined (__arm__)
-#include <arm/limits.h>
 #else
 #error architecture not supported
 #endif
index f34ed4fd023a218df69ef41c135668c31ec5be65..9f2be77c494a6360cefa708cdfb580443dc20136 100644 (file)
@@ -14836,13 +14836,6 @@ dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
            dtrace_provider, NULL, NULL, "END", 0, NULL);
        dtrace_probeid_error = dtrace_probe_create((dtrace_provider_id_t)
            dtrace_provider, NULL, NULL, "ERROR", 3, NULL);
-#elif defined(__arm__)
-       dtrace_probeid_begin = dtrace_probe_create((dtrace_provider_id_t)
-           dtrace_provider, NULL, NULL, "BEGIN", 2, NULL);
-       dtrace_probeid_end = dtrace_probe_create((dtrace_provider_id_t)
-           dtrace_provider, NULL, NULL, "END", 1, NULL);
-       dtrace_probeid_error = dtrace_probe_create((dtrace_provider_id_t)
-           dtrace_provider, NULL, NULL, "ERROR", 4, NULL);
 #else
 #error Unknown Architecture
 #endif /* __APPLE__ */
index 249060cd3849b41eba2ac27cff5de9b2c9ef3935..14895f8d983e8fd09e8f0263148be40930cfaf0f 100644 (file)
@@ -69,8 +69,6 @@
 extern struct savearea *find_kern_regs(thread_t);
 #elif defined(__i386__) || defined(__x86_64__)
 extern x86_saved_state32_t *find_kern_regs(thread_t);
-#elif defined (__arm__)
-extern struct arm_saved_state *find_kern_regs(thread_t);
 #else
 #error Unknown architecture
 #endif
@@ -139,8 +137,6 @@ static dtrace_provider_id_t profile_id;
 #define PROF_ARTIFICIAL_FRAMES 8
 #elif defined(__i386__) || defined(__x86_64__)
 #define PROF_ARTIFICIAL_FRAMES  9
-#elif defined(__arm__)
-#define PROF_ARTIFICIAL_FRAMES 3 /* XXX BOGUS ARMTODO */
 #else
 #error Unknown architecture
 #endif
index d625d7e80dce03af4df1850253ae2e6d0511eab2..ad19d6df010953d83378f321413254283ad04343 100644 (file)
@@ -54,8 +54,6 @@
 #define I386_SYSCALL_NUMBER_MASK (0xFFFF)
 
 typedef x86_saved_state_t savearea_t;
-#elif defined(__arm__)
-typedef struct arm_saved_state savearea_t;
 #endif
 
 #include <sys/param.h>
@@ -81,9 +79,6 @@ typedef struct arm_saved_state savearea_t;
 #elif defined(__i386__) || defined (__x86_64__)
 #define        SYSTRACE_ARTIFICIAL_FRAMES      2
 #define MACHTRACE_ARTIFICIAL_FRAMES 3
-#elif defined(__arm__)
-#define        SYSTRACE_ARTIFICIAL_FRAMES      2 /* XXX ARMTODO */
-#define MACHTRACE_ARTIFICIAL_FRAMES 3 /* XXX ARMTODO */
 #else
 #error Unknown Architecture
 #endif
@@ -159,8 +154,6 @@ dtrace_systrace_syscall(struct proc *pp, void *uap, int *rv)
                         */
                }
        }
-#elif defined(__arm__)
-       do {} while(0); /* XXX what is the right ABI */
 #else
 #error Unknown Architecture
 #endif
@@ -868,8 +861,6 @@ dtrace_machtrace_syscall(struct mach_call_args *args)
                        code = -saved_state32(tagged_regs)->eax;
                }
        }
-#elif defined(__arm__)
-       do {} while(0); /* XXX ARMTODO */
 #else
 #error Unknown Architecture
 #endif
index 5d149c7dbcc3bca77eec17701ed7d90cf5661f1e..fcd359b617e55b1792b7eef0066e884c708fdaf1 100644 (file)
@@ -92,14 +92,6 @@ mythread_state_flavor_t thread_flavor_array [] = {
                {x86_EXCEPTION_STATE, x86_EXCEPTION_STATE_COUNT},
                };
 int mynum_flavors=3;
-#elif defined (__arm__)
-mythread_state_flavor_t thread_flavor_array[]={
-               {ARM_THREAD_STATE , ARM_THREAD_STATE_COUNT},
-               {ARM_VFP_STATE, ARM_VFP_STATE_COUNT}, 
-               {ARM_EXCEPTION_STATE, ARM_EXCEPTION_STATE_COUNT}
-               };
-int mynum_flavors=3;
-
 #else
 #error architecture not supported
 #endif
index e5a10c5b2c85ab17155e983036bf2b0fff9c914f..0b8f8f02468e51bd418aee91d8afdfd8c45fa860 100644 (file)
@@ -484,8 +484,6 @@ sysctl_mib_init(void)
     cpu64bit = (_cpu_capabilities & k64Bit) == k64Bit;
 #elif defined(__i386__)
     cpu64bit = (_get_cpu_capabilities() & k64Bit) == k64Bit;
-#elif defined(__arm__)
-    cpu64bit = 0; // FIXME make this not hard-coded
 #endif
 
        /*
@@ -652,28 +650,6 @@ sysctl_mib_init(void)
        packages = ml_cpu_cache_sharing(0) /
                        cpuid_info()->cpuid_cores_per_package;
        
-#elif defined(__arm__) /* end __i386 */
-       switch (cpuid_info()->arm_info.arm_part) {
-               case CPU_PART_1136JFS:
-               case CPU_PART_1176JZFS:
-                       cpufamily = CPUFAMILY_ARM_11;
-                       break;
-               case CPU_PART_920T:
-                       cpufamily = CPUFAMILY_ARM_9;
-                       break;
-               default:
-                       cpufamily = CPUFAMILY_UNKNOWN;
-       }
-
-       cacheconfig[0] = cache_info()->c_unified;
-       cacheconfig[1] = cache_info()->c_isize;
-       cacheconfig[2] = cache_info()->c_dsize;
-       cacheconfig[3] = cache_info()->c_type;
-       cacheconfig[4] = cache_info()->c_linesz;
-       cacheconfig[5] = cache_info()->c_assoc;
-       cacheconfig[6] = 0;
-
-       packages = 1;
 #else /* end __arm__ */
 # warning we do not support this platform yet
 #endif /* __ppc__ */
index 153a2fa817d317ba971774ec4943ff49c46e83d0..980c1ad892c9ff2c1d243347d3a116ff84a7bc74 100644 (file)
@@ -819,8 +819,6 @@ bsdthread_create(__unused struct proc *p, struct bsdthread_create_args  *uap, us
        stackaddr = 0xF0000000;
 #elif defined(__i386__)
        stackaddr = 0xB0000000;
-#elif defined(__arm__)
-       stackaddr = 0xB0000000; /* XXX ARM */
 #else
 #error Need to define a stack address hint for this architecture
 #endif
@@ -943,24 +941,6 @@ bsdthread_create(__unused struct proc *p, struct bsdthread_create_args  *uap, us
                thread_set_wq_state64(th, (thread_state_t)ts64);
        }
        }
-#elif defined(__arm__)
-       {
-       int flavor=0, count=0;
-       void * state;
-
-       kret = thread_getstatus(th, flavor, (thread_state_t)&state, &count);
-       if (kret != KERN_SUCCESS) {
-               error = EINVAL;
-               goto out1;
-       }
-
-       /* XXX ARM TODO */
-
-       kret = thread_setstatus(th, flavor, (thread_state_t)&state, count);
-       if (kret != KERN_SUCCESS)
-               error = EINVAL;
-               goto out1;
-       }
 #else
 #error bsdthread_create  not defined for this architecture
 #endif
@@ -1385,8 +1365,6 @@ workqueue_addnewthread(struct workqueue *wq)
        stackaddr = 0xF0000000;
 #elif defined(__i386__)
        stackaddr = 0xB0000000;
-#elif defined(__arm__)
-       stackaddr = 0xB0000000; /* XXX ARM */
 #else
 #error Need to define a stack address hint for this architecture
 #endif
@@ -2070,15 +2048,6 @@ setup_wqthread(proc_t p, thread_t th, user_addr_t item, int reuse_thread, struct
 
                thread_set_wq_state64(th, (thread_state_t)ts64);
        }
-#elif defined(__arm__)
-       arm_thread_state_t state;
-       arm_thread_state_t *ts = &state;
-
-       /* XXX ARM add more */
-       ts->pc = p->p_wqthread;
-       ts->sp = tl->th_stackaddr + PTH_DEFAULT_GUARDSIZE;
-
-       thread_set_wq_state32(th, (thread_state_t)ts);
 #else
 #error setup_wqthread  not defined for this architecture
 #endif
index c7588d418e6c15ad7d3a7d28e85688ffda2baaf7..81b719c2eb58048bb7bd32d95b39d3fc976f8917 100644 (file)
@@ -76,9 +76,6 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <mach/vm_param.h>
-#if __arm__
-#include <arm/arch.h> /* for _ARM_ARCH_* */
-#endif
 
 #ifdef __APPLE_API_OBSOLETE
 /* BCD conversions. */
index 373e726f0669d6f5858fa57e8710a50ca39376c1..dd32b61972da7d8910588d20435e92ab8ecc6ea3 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/_limits.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/_limits.h"
-#elif defined (__arm__)
-#include "arm/_limits.h"
 #else
 #error architecture not supported
 #endif
index 4171fd03cf74d8a97db55422d0dba333ba06713c..844370744dfe22a7492beb7bebb83cf8c8f1a389 100644 (file)
@@ -29,8 +29,6 @@
 #include "ppc/_param.h"
 #elif defined (__i386__) || defined (__x86_64__)
 #include "i386/_param.h"
-#elif defined (__arm__)
-#include "arm/_param.h"
 #else
 #error architecture not supported
 #endif
index 0e359387eea4a12e1f4329c5f11366cc4ba477de..a0e15996e7873ab7f4096245015047f3b59c05c1 100644 (file)
@@ -29,8 +29,6 @@
 #include "ppc/_structs.h"
 #elif defined (__i386__) || defined (__x86_64__)
 #include "i386/_structs.h"
-#elif defined (__arm__)
-#include "arm/_structs.h"
 #else
 #error architecture not supported
 #endif
index 9f2d6d255558c4a127127e86c75fc7aaf21f026d..ceac56ea0af4e232759fb79ef0ea2a8899ac9f08 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/_types.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/_types.h"
-#elif defined (__arm__)
-#include "arm/_types.h"
 #else
 #error architecture not supported
 #endif
index 38b771d8627224d699c66e994ee1f152724c3f4d..bddd7e98906836ac5cb05de4f09d478120595707 100644 (file)
@@ -32,8 +32,6 @@
 #include <dev/ppc/cons.h>
 #elif defined (__i386__) || defined(__x86_64__)
 #include <dev/i386/cons.h>
-#elif defined (__arm__)
-#include <dev/arm/cons.h>
 #else
 #error architecture not supported
 #endif
index 1a2e2b230da154826a17e7a9e59358785ce459dc..93fa986ed3de368e18582f976c6ecc03fe0e33ec 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/disklabel.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/disklabel.h"
-#elif defined (__arm__)
-#include "arm/disklabel.h"
 #else
 #error architecture not supported
 #endif
index a49d52ac9e1d67c13b5aaf75f0a0e1b8c792a618..879cf17bdbb2e977a7427dc4058b9888d0741a5a 100644 (file)
@@ -35,8 +35,6 @@
 #include "ppc/endian.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/endian.h"
-#elif defined (__arm__)
-#include "arm/endian.h"
 #else
 #error architecture not supported
 #endif
index d866b9b42598fc09d9bd15c63ca026b1a6f02f09..fc8a27279e8eaaadfe56800dddbaba200f3f9c6b 100644 (file)
@@ -55,8 +55,6 @@ int grade_binary(cpu_type_t, cpu_subtype_t);
 #include "ppc/exec.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/exec.h"
-#elif defined (__arm__)
-#include "arm/exec.h"
 #else
 #error architecture not supported
 #endif
index fa881d3298c8d8268356fba7d5bbf8d9f4d21b92..d57bac1ba82c32f651c3188a940a07f305f67846 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/fasttrap_isa.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/fasttrap_isa.h"
-#elif defined (__arm__)
-#include "arm/fasttrap_isa.h"
 #else
 #error architecture not supported
 #endif
index 0b2a2ad304c3cc56187bf080d338d5154e857f09..6253a5fb46e3ae29ddd75f71bff34f50104326bf 100644 (file)
@@ -35,8 +35,6 @@
 #include "ppc/param.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/param.h"
-#elif defined (__arm__)
-#include "arm/param.h"
 #else
 #error architecture not supported
 #endif
index 45e4de8da8114014d600b5065ac0223aaf31acec..ea28264c6fddeb700a6a43e46b80d0109b793607 100644 (file)
@@ -37,8 +37,6 @@
 #include "ppc/profile.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/profile.h"
-#elif defined (__arm__)
-#include "arm/profile.h"
 #else
 #error architecture not supported
 #endif
index 5abfaef6fa1400bc5c02472c79b45912e9ac8141..711639e4fd723c462a6f849f102e1d72e6c9e8aa 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/psl.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/psl.h"
-#elif defined (__arm__)
-#include "arm/psl.h"
 #else
 #error architecture not supported
 #endif
index 964abe15c60fbdaf570215e307dce476d6dd373e..031327fe4165fdc36a6e87c8cfe41b5b7aab1377 100644 (file)
@@ -35,8 +35,6 @@
 #include "ppc/ptrace.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/ptrace.h"
-#elif defined (__arm__)
-#include "arm/ptrace.h"
 #else
 #error architecture not supported
 #endif
index 50c61c021447ecd95c4d765445286ee93bce52de..cf91c27da35649aa1c683e57c5795e8b8f0e96cf 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/reboot.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/reboot.h"
-#elif defined (__arm__)
-#include "arm/reboot.h"
 #else
 #error architecture not supported
 #endif
index f5eb3b9e1bccb5e9bee38697c69da3e85af87d86..95ec0f7d166b8c25bd846b4564f7d6d25668a320 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/reg.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/reg.h"
-#elif defined (__arm__)
-#include "arm/reg.h"
 #else
 #error architecture not supported
 #endif
index 9aa71b5afd08ec98cdb614e50ac0965cde9e7fcd..4f37be1d329d05b46595cfee03ef507848015828 100644 (file)
@@ -35,8 +35,6 @@
 #include "ppc/setjmp.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/setjmp.h"
-#elif defined (__arm__)
-#include "arm/setjmp.h"
 #else
 #error architecture not supported
 #endif
index 7457d1ca22b98ef80225ad2522d52ead8d2802c7..227d4182e7eabbe2f5d262146f8c4a7dd6aa3bc8 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/signal.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/signal.h"
-#elif defined (__arm__)
-#include "arm/signal.h"
 #else
 #error architecture not supported
 #endif
index 2bff80981c4e0baa8a7cb0a2fb513d69870f7dd6..ed113dddec1611a8c3952dc0d3f6ba018a238008 100644 (file)
@@ -35,8 +35,6 @@
 #include "ppc/types.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/types.h"
-#elif defined (__arm__)
-#include "arm/types.h"
 #else
 #error architecture not supported
 #endif
index 6ecf3e26f76d043f7e769c15a29b6f72b9286a4f..a0e91489a0239d42acb96e030cedd5ea6d149be6 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/ucontext.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/ucontext.h"
-#elif defined (__arm__)
-#include "arm/ucontext.h"
 #else
 #error architecture not supported
 #endif
index d9d0d74edfd3e979d73adaeeea95342b6296bbcb..8911ea054b801b2e1f11e61b4d117d0d6f5a7a45 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/vmparam.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "i386/vmparam.h"
-#elif defined (__arm__)
-#include "arm/vmparam.h"
 #else
 #error architecture not supported
 #endif
index 4673b53a3ef438586ea4e6d8bc0cc16d3f5d9efd..8a4da6c6c951a5f05941e90ce7e9d6fe6a8ba19d 100644 (file)
@@ -149,14 +149,6 @@ struct ether_desc_blk_str {
 __private_extern__ u_char      etherbroadcastaddr[ETHER_ADDR_LEN] =
                                                                { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
-#if defined (__arm__)
-static __inline__ int
-_ether_cmp(const void * a, const void * b)
-{
-       return (memcmp(a, b, ETHER_ADDR_LEN));
-}
-
-#else
 static __inline__ int
 _ether_cmp(const void * a, const void * b)
 {
@@ -170,7 +162,6 @@ _ether_cmp(const void * a, const void * b)
        }
        return (0);
 }
-#endif
 
 /*
  * Release all descriptor entries owned by this protocol (there may be several).
index 062109012518e846490b23c859a0e41faddc9811..f0b0f5b54ef30322503c57b106d49cd1a29780ee 100644 (file)
@@ -112,22 +112,12 @@ extern void *kdp_get_interface(void);
 extern void kdp_set_ip_and_mac_addresses(struct in_addr *ipaddr,
                                                                                 struct ether_addr *macaddr);
 
-#if defined (__arm__)
-static __inline__ void
-_ip_copy(struct in_addr * dst, const struct in_addr * src)
-{
-       memcpy(dst, src, sizeof(*dst));
-       return;
-}
-
-#else
 static __inline__ void
 _ip_copy(struct in_addr * dst, const struct in_addr * src)
 {
        *dst = *src;
        return;
 }
-#endif
 
 static void
 ether_inet_arp_input(
index 8b2ab3e1f7f52da37d08d8a622aae5885771edbb..b1dccb036b823f4b54e52ec78ac257d53b4b685a 100644 (file)
@@ -689,13 +689,11 @@ loop:
 
                        ts.tv_sec = 2;
                        ts.tv_nsec = 0;
-                       error = msleep(bp, nfs_buf_mutex, slpflag|(PRIBIO+1)|PDROP,
+                       msleep(bp, nfs_buf_mutex, slpflag|(PRIBIO+1)|PDROP,
                                        "nfsbufget", (slpflag == PCATCH) ? NULL : &ts);
-                       if (error == EWOULDBLOCK)
-                               error = 0;
                        slpflag = 0;
                        FSDBG_BOT(543, np, blkno, bp, bp->nb_flags);
-                       if (error || ((error = nfs_sigintr(VTONMP(vp), NULL, thd, 0)))) {
+                       if ((error = nfs_sigintr(VTONMP(vp), NULL, thd, 0))) {
                                FSDBG_BOT(541, np, blkno, 0, error);
                                return (error);
                        }
@@ -847,9 +845,9 @@ loop:
                        nfs_buf_delwri_push(1);
 
                        nfsneedbuffer = 1;
-                       error = msleep(&nfsneedbuffer, nfs_buf_mutex, PCATCH|PDROP, "nfsbufget", NULL);
+                       msleep(&nfsneedbuffer, nfs_buf_mutex, PCATCH|PDROP, "nfsbufget", NULL);
                        FSDBG_BOT(546, np, blkno, nfsbufcnt, nfsbufmax);
-                       if (error || ((error = nfs_sigintr(VTONMP(vp), NULL, thd, 0)))) {
+                       if ((error = nfs_sigintr(VTONMP(vp), NULL, thd, 0))) {
                                FSDBG_BOT(541, np, blkno, 0, error);
                                return (error);
                        }
@@ -2334,12 +2332,11 @@ nfs_async_write_start(struct nfsmount *nmp)
        if (nfs_max_async_writes <= 0)
                return (0);
        lck_mtx_lock(&nmp->nm_lock);
-       while (!error && (nfs_max_async_writes > 0) && (nmp->nm_asyncwrites >= nfs_max_async_writes)) {
+       while ((nfs_max_async_writes > 0) && (nmp->nm_asyncwrites >= nfs_max_async_writes)) {
                if ((error = nfs_sigintr(nmp, NULL, current_thread(), 1)))
                        break;
-               error = msleep(&nmp->nm_asyncwrites, &nmp->nm_lock, slpflag|(PZERO-1), "nfsasyncwrites", &ts);
-               if (error == EWOULDBLOCK)
-                       error = 0;
+               msleep(&nmp->nm_asyncwrites, &nmp->nm_lock, slpflag|(PZERO-1), "nfsasyncwrites", &ts);
+               slpflag = 0;
        }
        if (!error)
                nmp->nm_asyncwrites++;
index 4c21d2115fa757cfd5e21a60636a121e05e9ddf2..fdb3ae1c5a9b2fb9319618206376008bc6adb138 100644 (file)
@@ -263,11 +263,7 @@ nfs_connect(struct nfsmount *nmp)
                        }
                        if ((error = nfs_sigintr(nmp, NULL, current_thread(), 1)))
                                break;
-                       error = msleep(&nmp->nm_so, &nmp->nm_lock, PSOCK, "nfs_socket_connect", &ts);
-                       if (error == EWOULDBLOCK)
-                               error = 0;
-                       if (error)
-                               break;
+                       msleep(&nmp->nm_so, &nmp->nm_lock, PSOCK, "nfs_socket_connect", &ts);
                }
                if (tocnt > 15)
                        log(LOG_INFO, "nfs_connect: socket connect %s for %s\n",
@@ -692,7 +688,7 @@ nfs_send(struct nfsreq *req, int wait)
 {
        struct nfsmount *nmp;
        socket_t so;
-       int error, error2, sotype, rexmit, slpflag = PSOCK, needrecon;
+       int error, error2, sotype, rexmit, slpflag = 0, needrecon;
        struct msghdr msg;
        struct sockaddr *sendnam;
        mbuf_t mreqcopy;
@@ -750,11 +746,8 @@ again:
                        nfs_mount_sock_thread_wake(nmp);
                        if ((error = nfs_sigintr(req->r_nmp, req, req->r_thread, 1)))
                                break;
-                       error = msleep(req, &nmp->nm_lock, slpflag, "nfsconnectwait", &ts);
-                       if (error == EWOULDBLOCK)
-                               error = 0;
-                       if ((error == EINTR) || (error == ERESTART))
-                               break;
+                       msleep(req, &nmp->nm_lock, slpflag|PSOCK, "nfsconnectwait", &ts);
+                       slpflag = 0;
                }
                lck_mtx_unlock(&nmp->nm_lock);
                if (error)
@@ -793,17 +786,14 @@ again:
                                if ((error = nfs_sigintr(req->r_nmp, req, req->r_thread, 1)))
                                        break;
                                TAILQ_INSERT_TAIL(&nmp->nm_cwndq, req, r_cchain);
-                               error = msleep(req, &nmp->nm_lock, slpflag | (PZERO - 1), "nfswaitcwnd", &ts);
+                               msleep(req, &nmp->nm_lock, slpflag | (PZERO - 1), "nfswaitcwnd", &ts);
+                               slpflag = 0;
                                if ((req->r_cchain.tqe_next != NFSREQNOLIST)) {
                                        TAILQ_REMOVE(&nmp->nm_cwndq, req, r_cchain);
                                        req->r_cchain.tqe_next = NFSREQNOLIST;
                                }
-                               if ((error == EINTR) || (error == ERESTART))
-                                       break;
                        }
                        lck_mtx_unlock(&nmp->nm_lock);
-                       if ((error == EINTR) || (error == ERESTART))
-                               return (error);
                        goto again;
                }
                /*
@@ -1333,11 +1323,8 @@ nfs_wait_reply(struct nfsreq *req)
                /* need to poll if we're P_NOREMOTEHANG */
                if (nfs_noremotehang(req->r_thread))
                        ts.tv_sec = 1;
-               error = msleep(req, &req->r_mtx, slpflag | (PZERO - 1), "nfswaitreply", &ts);
-               if (error == EWOULDBLOCK)
-                       error = 0;
-               if ((error == EINTR) || (error == ERESTART))
-                       break;
+               msleep(req, &req->r_mtx, slpflag | (PZERO - 1), "nfswaitreply", &ts);
+               slpflag = 0;
        }
        lck_mtx_unlock(&req->r_mtx);
 
@@ -2018,12 +2005,11 @@ nfs_request_async(
                        /* make sure to wait until this async I/O request gets sent */
                        int slpflag = (req->r_nmp && (req->r_nmp->nm_flag & NFSMNT_INT) && req->r_thread) ? PCATCH : 0;
                        struct timespec ts = { 2, 0 };
-                       while (!error && !(req->r_flags & R_SENT)) {
+                       while (!(req->r_flags & R_SENT)) {
                                if ((error = nfs_sigintr(req->r_nmp, req, req->r_thread, 0)))
                                        break;
-                               error = msleep(req, &req->r_mtx, slpflag | (PZERO - 1), "nfswaitsent", &ts);
-                               if (error == EWOULDBLOCK)
-                                       error = 0;
+                               msleep(req, &req->r_mtx, slpflag | (PZERO - 1), "nfswaitsent", &ts);
+                               slpflag = 0;
                        }
                }
                sent = req->r_flags & R_SENT;
@@ -2480,15 +2466,13 @@ nfs_sndlock(struct nfsreq *req)
 
        if ((nmp->nm_flag & NFSMNT_INT) && req->r_thread)
                slpflag = PCATCH;
-       while (!error && (*statep & NFSSTA_SNDLOCK)) {
+       while (*statep & NFSSTA_SNDLOCK) {
                if ((error = nfs_sigintr(nmp, req, req->r_thread, 1)))
                        break;
                *statep |= NFSSTA_WANTSND;
                if (nfs_noremotehang(req->r_thread))
                        ts.tv_sec = 1;
-               error = msleep(statep, &nmp->nm_lock, slpflag | (PZERO - 1), "nfsndlck", &ts);
-               if (error == EWOULDBLOCK)
-                       error = 0;
+               msleep(statep, &nmp->nm_lock, slpflag | (PZERO - 1), "nfsndlck", &ts);
                if (slpflag == PCATCH) {
                        slpflag = 0;
                        ts.tv_sec = 2;
index 7785b9b34febef26cb19eee5a6220d9ebb01be41..9be90489bcc4435606cc5fef3048abb403de1b74 100644 (file)
@@ -2291,9 +2291,6 @@ extern int (*dtrace_return_probe_ptr)(ppc_saved_state_t* regs);
 #elif defined (__i386__) || defined(__x86_64__)
 extern int (*dtrace_pid_probe_ptr)(x86_saved_state_t *regs);
 extern int (*dtrace_return_probe_ptr)(x86_saved_state_t* regs);
-#elif defined (__arm__)
-extern int (*dtrace_pid_probe_ptr)(struct arm_saved_state *regs);
-extern int (*dtrace_return_probe_ptr)(struct arm_saved_state* regs);
 #else
 #error architecture not supported
 #endif
index 8625c6494abe1a0b097e718dbe6018397d3a4a9c..0570f0c5eb5772b478d6b15979b207d7ef19f67f 100644 (file)
@@ -204,8 +204,6 @@ extern int fasttrap_return_probe(ppc_saved_state_t* regs);
 #elif defined (__i386__) || defined(__x86_64__)
 extern int fasttrap_pid_probe(x86_saved_state_t *regs);
 extern int fasttrap_return_probe(x86_saved_state_t* regs);
-#elif defined(__arm__)
-extern int fasttrap_pid_probe(struct arm_saved_state *rp); /* so very, very, very broken... */
 #else
 #error architecture not supported
 #endif
index 8121ebbbe6105340bceee1fb83402634782524b6..c72208c99f9ffc90de305318e380be45f1962ecf 100644 (file)
@@ -33,8 +33,6 @@
 typedef uint32_t machine_inst_t;
 #elif defined(__i386__) || defined (__x86_64__)
 typedef uint8_t machine_inst_t;
-#elif defined(__arm__)
-typedef uint32_t machine_inst_t; /* XXX is this correct? Thumb? */
 #else
 #error Unknown Architecture
 #endif
index caa6250314b551e8f6391804f5dfe9e4dde6350c..21a169223af568aa141b5e024b3bc42204fa179a 100644 (file)
@@ -59,8 +59,6 @@ extern "C" {
 
 #if defined(__ppc__)
 #define        CPU_CACHE_SIZE  128
-#elif defined(__arm__)
-#define        CPU_CACHE_SIZE  32
 #else
 #define        CPU_CACHE_SIZE  64
 #endif
index f1d48861ca114619d9f3a67310f4d4b88a52a8d9..8f7145d19d5826bd3d40b1bc8e843f651d88f7f6 100644 (file)
@@ -1104,7 +1104,11 @@ replay_journal(journal *jnl)
                    goto bad_txn_handling;
                }
 
-               if (blhdr->binfo[0].b.sequence_num < last_sequence_num) {
+               if (   (last_sequence_num != 0)
+                   && (blhdr->binfo[0].b.sequence_num != 0)
+                   && (blhdr->binfo[0].b.sequence_num != last_sequence_num)
+                   && (blhdr->binfo[0].b.sequence_num != last_sequence_num+1)) {
+
                    txn_start_offset = jnl->jhdr->end = blhdr_offset;
 
                    if (check_past_jnl_end) {
index d3efc95f2c136af68bd7fce45b90db2f04e65532..dfaa71992b1320d8fb4bbb1300cb22ebbda05869 100644 (file)
@@ -1,4 +1,4 @@
-9.0.0
+9.1.0
 
 # The first line of this file contains the master version number for the kernel.
 # All other instances of the kernel version in xnu are derived from this file.
index 7746639ba8cbe6a3be49386c68df5253efd36f65..b348bc820bf4d8b7eb37a63dc278470f00a57e6e 100644 (file)
@@ -30,8 +30,6 @@
 #include "IOKit/ppc/IOSharedLockImp.h"
 #elif defined (__i386__)
 #include "IOKit/i386/IOSharedLockImp.h"
-#elif defined (__arm__)
-#include "IOKit/arm/IOSharedLockImp.h"
 #else
 #error architecture not supported
 #endif
index 58d4836c4998691b8f4e5498148dfc6be73e7a65..030368a72f658f89d554758773eb209f515db31a 100644 (file)
@@ -942,14 +942,15 @@ if (vars->position & (vars->blockSize - 1)) HIBLOG("misaligned file pos %qx\n",
                 }
            }
 
-           if (vars->extentRemaining <= vars->bufferSize)
-               vars->lastRead = vars->extentRemaining;
-           else
-               vars->lastRead = vars->bufferSize;
-
+           uint64_t length;
+           uint64_t lastReadLength = vars->lastRead;
            uint64_t offset = (vars->position 
                                - vars->extentPosition + vars->currentExtent->start);
-           uint64_t length = (vars->lastRead);
+           if (vars->extentRemaining <= vars->bufferSize)
+               length = vars->extentRemaining;
+           else
+               length = vars->bufferSize;
+           vars->lastRead = length;
 
 //if (length != vars->bufferSize) HIBLOG("short read of %qx ends@ %qx\n", length, offset + length);
 
@@ -967,12 +968,12 @@ if (vars->position & (vars->blockSize - 1)) HIBLOG("misaligned file pos %qx\n",
                 uint8_t thisVector[AES_BLOCK_SIZE];
                 // save initial vector for following decrypts
                 bcopy(&cryptvars->aes_iv[0], &thisVector[0], AES_BLOCK_SIZE);
-                bcopy(vars->buffer + vars->bufferHalf + vars->lastRead - AES_BLOCK_SIZE, 
+                bcopy(vars->buffer + vars->bufferHalf + lastReadLength - AES_BLOCK_SIZE, 
                         &cryptvars->aes_iv[0], AES_BLOCK_SIZE);
                 // decrypt the buffer
                 aes_decrypt_cbc(vars->buffer + vars->bufferHalf,
                                 &thisVector[0],
-                                vars->lastRead / AES_BLOCK_SIZE,
+                                lastReadLength / AES_BLOCK_SIZE,
                                 vars->buffer + vars->bufferHalf,
                                 &cryptvars->ctx.decrypt);
             }
@@ -2306,7 +2307,9 @@ hibernate_machine_init(void)
         uint32_t     tag;
        vm_offset_t  ppnum, compressedSize;
 
-       IOPolledFileRead(vars->fileVars, src, 8, cryptvars);
+       err = IOPolledFileRead(vars->fileVars, src, 8, cryptvars);
+       if (kIOReturnSuccess != err)
+           break;
 
        ppnum = header[0];
        count = header[1];
@@ -2318,9 +2321,17 @@ hibernate_machine_init(void)
 
        for (page = 0; page < count; page++)
        {
-           IOPolledFileRead(vars->fileVars, (uint8_t *) &tag, 4, cryptvars);
+           err = IOPolledFileRead(vars->fileVars, (uint8_t *) &tag, 4, cryptvars);
+           if (kIOReturnSuccess != err)
+               break;
 
            compressedSize = kIOHibernateTagLength & tag;
+           if (kIOHibernateTagSignature != (tag & ~kIOHibernateTagLength))
+           {
+               err = kIOReturnIPCError;
+               break;
+           }
+
            if (!compressedSize)
            {
                ppnum++;
@@ -2328,9 +2339,11 @@ hibernate_machine_init(void)
                continue;
            }
 
-           IOPolledFileRead(vars->fileVars, src, (compressedSize + 3) & ~3, cryptvars);
-   
-           if (compressedSize != page_size)
+           err = IOPolledFileRead(vars->fileVars, src, (compressedSize + 3) & ~3, cryptvars);
+           if (kIOReturnSuccess != err)
+               break;
+
+           if (compressedSize < page_size)
            {
                decoOffset = page_size;
                WKdm_decompress((WK_word*) src, (WK_word*) (src + decoOffset), PAGE_SIZE_IN_WORDS);
@@ -2342,7 +2355,10 @@ hibernate_machine_init(void)
 
            err = IOMemoryDescriptorReadToPhysical(vars->srcBuffer, decoOffset, ptoa_64(ppnum), page_size);
            if (err)
+           {
                HIBLOG("IOMemoryDescriptorReadToPhysical [%d] %x\n", ppnum, err);
+               break;
+           }
 
            ppnum++;
            pagesDone++;
@@ -2375,6 +2391,9 @@ hibernate_machine_init(void)
     }
     while (true);
 
+    if (kIOReturnSuccess != err)
+       panic("Hibernate restore error %x", err);
+
     gIOHibernateCurrentHeader->actualImage2Sum = sum;
 
     if (vars->fileVars->io)
index 255f93221d97644b58a34236cc0826f5eac0e1c9..405d646463ccc51a91bf3923747d3f614d4e4b31 100644 (file)
@@ -519,9 +519,6 @@ hibernate_kernel_entrypoint(IOHibernateImageHeader * header,
     // flush caches
     __asm__("wbinvd");
     proc();
-#elif __arm__
-    proc = (ResetProc)0x00000000;
-    proc();
 #endif
   
     return -1;
index 09135d172fb390838b270f640383d76276020ff8..54eaa0e3c7a42183a75fca994dc29b91ad66c35f 100644 (file)
@@ -301,7 +301,10 @@ do {                                                                       \
     bool more;
     do {
        CLRP(&fFlags, kLoopRestart);
-       workToDo = more = false;
+       more = false;
+       IOInterruptState is = IOSimpleLockLockDisableInterrupt(workToDoLock);
+       workToDo = false;
+       IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
        for (IOEventSource *evnt = eventChain; evnt; evnt = evnt->getNext()) {
 
            IOTimeClientS();
index 43544373fd02c7cace883ceae66ddb0120742e14..3690714e8ca74dd84ec16b02da3a6ee74e4c712c 100644 (file)
@@ -50,9 +50,6 @@ extern vm_offset_t max_valid_stack_address(void);
 extern void kmod_dump_log(vm_offset_t *addr, unsigned int cnt);
 
 extern addr64_t kvtophys(vm_offset_t va);
-#if __arm__
-extern int copyinframe(vm_address_t fp, uint32_t *frame);
-#endif
 
 __END_DECLS
 
@@ -222,30 +219,6 @@ pad:
 
     for ( ; frame_index < maxAddrs; frame_index++)
            bt[frame_index] = (void *) 0;
-#elif __arm__
-    uint32_t i= 0;
-    uint32_t frameb[2];
-    uint32_t fp= 0;
-    
-    // get the current frame pointer for this thread
-    __asm__ volatile("mov %0,r7" : "=r" (fp)); 
-    
-    // now crawl up the stack recording the link value of each frame
-    do {
-      // check bounds
-      if ((fp == 0) || ((fp & 3) != 0) || (fp > VM_MAX_KERNEL_ADDRESS) || (fp < VM_MIN_KERNEL_ADDRESS)) {
-       break;
-      }
-      // safely read frame
-      if (copyinframe(fp, frameb) != 0) {
-       break;
-      }
-      
-      // No need to use copyin as this is always a kernel address, see check above
-      bt[i] = (void*)frameb[1];        // link register
-      fp = frameb[0]; 
-    } while (++i < maxAddrs);
-    frame= i;
 #else
 #error arch
 #endif
index 19fe32cc4286a5a85fba2a06576a0f98d044a6b7..17e5dbd2dd072fe155e5d462c3249ca5bcee3543 100644 (file)
@@ -341,10 +341,6 @@ static __inline__ void OSSynchronizeIO(void)
 #if defined(__ppc__)
         __asm__ ("eieio");
 #endif
-#if defined(__arm__)
-       UInt32 temp = 0;
-       __asm__ volatile("mcr p15, 0, %0, c7, c10, 4" : : "r" (temp));
-#endif
 }
 #endif
 
index 7b96a226434ea8cb9c2f5b4bd48bbf31913aa21c..48659ca2086d5d63db6f8d4a75804c09feb6ac0c 100644 (file)
@@ -43,8 +43,6 @@
 #include <libkern/ppc/OSByteOrder.h>
 #elif (defined(__i386__) || defined(__x86_64__))
 #include <libkern/i386/OSByteOrder.h>
-#elif defined(__arm__)
-#include <libkern/arm/OSByteOrder.h>
 #else
 #include <libkern/machine/OSByteOrder.h>
 #endif
index e6a30a1d8a82cd11ae57b80b98a75f5f7d1e1b85..f01425b02574478add4b8b11d20c7302a0fbb14e 100644 (file)
@@ -66,9 +66,6 @@
 #include <libkern/i386/_OSByteOrder.h>
 #endif
 
-#if defined(__arm__)
-#include <libkern/arm/OSByteOrder.h>
-#endif
 
 
 #define __DARWIN_OSSwapInt16(x) \
index 7c13293eabc7ba2679430f8fcb1f0fabdd48d861..1a67e85766ecf8a536cd9fcb3e28d39642336fc3 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/setjmp.h"
 #elif defined (__i386__)
 #include "i386/setjmp.h"
-#elif defined (__arm__)
-#include "arm/setjmp.h"
 #else
 #error architecture not supported
 #endif
index 3f95dbbaf4f7f8b321bec240f2b1a9ec16511659..53039d9e3e728e099a10f37a56153c65d8218a35 100644 (file)
@@ -213,183 +213,6 @@ LEAF(_##pseudo, 0)                                        ;\
        PSEUDO(pseudo, name, nargs)                     ;\
        ret
 
-#elif defined(__arm__)
-
-#define SWI_SYSCALL 0x80       // from <mach/vm_param.h>
-
-/*
- * ARM system call interface:
- *
- * swi 0x80
- * args: r0-r6
- * return code: r0
- * on error, carry bit is set in the psr, otherwise carry bit is cleared.
- */
-
-/*
- * Macros.
- */
-
-/*
- * until we update the architecture project, these live here
- */
-
-#if defined(__DYNAMIC__)
-#define MI_GET_ADDRESS(reg,var)  \
-       ldr     reg, 4f                                 ;\
-3:     ldr     reg, [pc, reg]                          ;\
-       b       5f                                      ;\
-4:     .long   6f - (3b + 8)                           ;\
-5:                                                     ;\
-       .non_lazy_symbol_pointer                        ;\
-6:                                                     ;\
-       .indirect_symbol var                            ;\
-       .long 0                                         ;\
-       .text                                           ;\
-       .align 2
-#else
-#define MI_GET_ADDRESS(reg,var)  \
-       ldr     reg, 3f ;\
-       b       4f      ;\
-3:     .long var       ;\
-4:
-#endif
-
-#if defined(__DYNAMIC__)
-#define MI_BRANCH_EXTERNAL(var)                                \
-       .globl  var                                                             ;\
-       MI_GET_ADDRESS(ip, var)                         ;\
-       bx      ip
-#else
-#define MI_BRANCH_EXTERNAL(var)                                ;\
-       .globl  var                                                             ;\
-       b       var
-#endif
-
-#if defined(__DYNAMIC__)
-#define MI_CALL_EXTERNAL(var)    \
-       .globl  var                             ;\
-       MI_GET_ADDRESS(ip,var)  ;\
-       mov     lr, pc          ;\
-       bx      ip
-#else
-#define MI_CALL_EXTERNAL(var)                          \
-       .globl  var                                                             ;\
-       bl      var
-#endif
-
-#define MI_ENTRY_POINT(name)                           \
-       .align 2        ;\
-       .globl  name                                                    ;\
-       .text                                                                   ;\
-name:
-
-/* load the syscall number into r12 and trap */
-#define DO_SYSCALL(num)                \
-       .if (((num) & 0xff) == (num))                                   ;\
-       mov             r12, #(num)                                     ;\
-       .elseif (((num) & 0x3fc) == (num))                              ;\
-       mov             r12, #(num)                                     ;\
-       .else                                                           ;\
-       mov             r12, #((num) & 0xffffff00)      /* top half of the syscall number */ ;\
-       orr             r12, r12, #((num) & 0xff)       /* bottom half */ ;\
-       .endif                                                          ;\
-       swi             #SWI_SYSCALL
-
-/* simple syscalls (0 to 4 args) */
-#define        SYSCALL_0to4(name)                                      \
-       MI_ENTRY_POINT(_##name)                                 ;\
-       DO_SYSCALL(SYS_##name)                                  ;\
-       bxcc    lr                                                              /* return if carry is clear (no error) */ ; \
-1:     MI_BRANCH_EXTERNAL(cerror)
-
-/* syscalls with 5 args is different, because of the single arg register load */
-#define        SYSCALL_5(name)                                         \
-       MI_ENTRY_POINT(_##name)                                 ;\
-       mov             ip, sp                                                  /* save a pointer to the args */ ; \
-       stmfd   sp!, { r4-r5 }                                  /* save r4-r5 */ ;\
-       ldr             r4, [ip]                                                /* load 5th arg */ ; \
-       DO_SYSCALL(SYS_##name)                                  ;\
-       ldmfd   sp!, { r4-r5 }                                  /* restore r4-r5 */ ; \
-       bxcc    lr                                                              /* return if carry is clear (no error) */ ; \
-1:     MI_BRANCH_EXTERNAL(cerror)
-
-/* syscalls with 6 to 8 args */
-#define SYSCALL_6to8(name, save_regs, arg_regs) \
-       MI_ENTRY_POINT(_##name)                                 ;\
-       mov             ip, sp                                                  /* save a pointer to the args */ ; \
-       stmfd   sp!, { save_regs }                              /* callee saved regs */ ;\
-       ldmia   ip, { arg_regs }                                /* load arg regs */ ; \
-       DO_SYSCALL(SYS_##name)                                  ;\
-       ldmfd   sp!, { save_regs }                              /* restore callee saved regs */ ; \
-       bxcc    lr                                                              /* return if carry is clear (no error) */ ; \
-1:     MI_BRANCH_EXTERNAL(cerror)
-
-#define COMMA ,
-
-#define SYSCALL_0(name)                                                SYSCALL_0to4(name)
-#define SYSCALL_1(name)                                                SYSCALL_0to4(name)
-#define SYSCALL_2(name)                                                SYSCALL_0to4(name)
-#define SYSCALL_3(name)                                                SYSCALL_0to4(name)
-#define SYSCALL_4(name)                                                SYSCALL_0to4(name)
-/* SYSCALL_5 declared above */
-#define SYSCALL_6(name)                                                SYSCALL_6to8(name, r4-r5, r4-r5)
-#define SYSCALL_7(name)                                                SYSCALL_6to8(name, r4-r6 COMMA r8, r4-r6)
-#define SYSCALL_8(name)                                                SYSCALL_6to8(name, r4-r6 COMMA r8, r4-r6 COMMA r8)
-
-/* select the appropriate syscall code, based on the number of arguments */
-#define SYSCALL(name, nargs)   SYSCALL_##nargs(name)
-
-#define        SYSCALL_NONAME_0to4(name)                       \
-       DO_SYSCALL(SYS_##name)                                  ;\
-       bcc             1f                                                              /* branch if carry bit is clear (no error) */ ; \
-       MI_BRANCH_EXTERNAL(cerror)                              /* call cerror */ ; \
-1:
-
-#define        SYSCALL_NONAME_5(name)                          \
-       mov             ip, sp                                                  /* save a pointer to the args */ ; \
-       stmfd   sp!, { r4-r5 }                                  /* save r4-r5 */ ;\
-       ldr             r4, [ip]                                                /* load 5th arg */ ; \
-       DO_SYSCALL(SYS_##name)                                  ;\
-       ldmfd   sp!, { r4-r5 }                                  /* restore r4-r7 */ ; \
-       bcc             1f                                                              /* branch if carry bit is clear (no error) */ ; \
-       MI_BRANCH_EXTERNAL(cerror)                              /* call cerror */ ; \
-1:
-
-#define        SYSCALL_NONAME_6to8(name, save_regs, arg_regs)  \
-       mov             ip, sp                                                  /* save a pointer to the args */ ; \
-       stmfd   sp!, { save_regs }                              /* callee save regs */ ;\
-       ldmia   ip, { arg_regs }                                /* load arguments */ ; \
-       DO_SYSCALL(SYS_##name)                                  ;\
-       ldmfd   sp!, { save_regs }                              /* restore callee saved regs */ ; \
-       bcc             1f                                                              /* branch if carry bit is clear (no error) */ ; \
-       MI_BRANCH_EXTERNAL(cerror)                              /* call cerror */ ; \
-1:
-
-#define SYSCALL_NONAME_0(name)                         SYSCALL_NONAME_0to4(name)
-#define SYSCALL_NONAME_1(name)                         SYSCALL_NONAME_0to4(name)
-#define SYSCALL_NONAME_2(name)                         SYSCALL_NONAME_0to4(name)
-#define SYSCALL_NONAME_3(name)                         SYSCALL_NONAME_0to4(name)
-#define SYSCALL_NONAME_4(name)                         SYSCALL_NONAME_0to4(name)
-/* SYSCALL_NONAME_5 declared above */
-#define SYSCALL_NONAME_6(name)                         SYSCALL_NONAME_6to8(name, r4-r5, r4-r5)
-#define SYSCALL_NONAME_7(name)                         SYSCALL_NONAME_6to8(name, r4-r6 COMMA r8, r4-r6)
-#define SYSCALL_NONAME_8(name)                         SYSCALL_NONAME_6to8(name, r4-r6 COMMA r8, r4-r6 COMMA r8)
-
-/* select the appropriate syscall code, based on the number of arguments */
-#define SYSCALL_NONAME(name, nargs)    SYSCALL_NONAME_##nargs(name)
-
-#define        PSEUDO(pseudo, name, nargs)                     \
-       .globl  _##pseudo                                               ;\
-       .text                                                                   ;\
-       .align  2                                                               ;\
-_##pseudo:                                                                     ;\
-       SYSCALL_NONAME(name, nargs)
-
-#define __SYSCALL(pseudo, name, nargs)         \
-       PSEUDO(pseudo, name, nargs)                             ;\
-       bx lr
-
 #else
 #error Unsupported architecture
 #endif
index 227812ecc13990a6edf33ae4b2599a372f1b71d0..baff6eb82d2f045963e69e555f0ac35333fb4f09 100644 (file)
@@ -243,70 +243,6 @@ L2:
        addq    $24, %rsp   // restore the stack
        ret             
 
-#elif defined(__arm__)
-       
-       .globl  cerror
-       MI_ENTRY_POINT(_fork)
-       stmfd   sp!, {r4, r7, lr}
-       add     r7, sp, #4
-       MI_CALL_EXTERNAL(__cthread_fork_prepare)
-       mov     r1, #1                                  // prime results
-       mov     r12, #SYS_fork
-       swi     #SWI_SYSCALL                            // make the syscall
-       bcs     Lbotch                                  // error?
-       cmp     r1, #0                                  // parent (r1=0) or child(r1=1)
-       beq     Lparent
-
-       //child here...
-       MI_GET_ADDRESS(r3, __current_pid)
-       mov     r0, #0
-       str     r0, [r3]                // clear cached pid in child
-
-#if defined(__DYNAMIC__)
-// Here on the child side of the fork we need to tell the dynamic linker that
-// we have forked.  To do this we call __dyld_fork_child in the dyanmic
-// linker.  But since we can't dynamicly bind anything until this is done we
-// do this by using the private extern __dyld_func_lookup() function to get the
-// address of __dyld_fork_child (the 'C' code equivlent):
-//
-//     _dyld_func_lookup("__dyld_fork_child", &address);
-//     address();
-//
-       .cstring
-       .align 2
-LC0:
-       .ascii "__dyld_fork_child\0"
-.text
-.align 2
-       sub     sp, sp, #4                              // allocate space for the address parameter
-       mov     r1, sp                                  // get the address of the allocated space
-       ldr     r0, LP0                                 // get the name of the function to look up
-L0:    add     r0, pc, r0
-       bl      __dyld_func_lookup
-       mov     lr, pc
-       ldr     pc, [sp], #4                            // call __dyld_fork_child indirectly and pop
-#endif
-       MI_CALL_EXTERNAL(__cthread_fork_child)          // let child get ready
-       mov     r0, #0
-        ldmfd   sp!, {r4, r7, pc}
-
-Lbotch:
-       MI_CALL_EXTERNAL(cerror)                        // jump here on error
-       mov     r0,#-1                                  // set the error
-       // fall thru
-       
-Lparent:       
-       mov     r4, r0                                  // save child pid
-       MI_CALL_EXTERNAL(__cthread_fork_parent)
-       mov     r0, r4                                  // restore child pid
-       ldmfd   sp!, {r4, r7, pc}                       // pop and return
-
-       .align 2
-#if defined(__DYNAMIC__)
-LP0:
-       .long   LC0-(L0+8)
-#endif
-
 #else
 #error Unsupported architecture
 #endif
index a6cc5a5f42cbaa7a365feb8334e212e52764b706..1299a164557279232a74a0bfb3578ea6e1d6f79f 100644 (file)
@@ -135,51 +135,6 @@ LEAF(___getpid, 0)
        movl            %edx, %eax
        ret
 
-#elif defined(__arm__)
-
-#include <arm/arch.h>
-       
-       .data
-       .globl  __current_pid
-       .align 2
-__current_pid:
-       /* Cached pid.  Possible values:
-        *      0:              no value cached
-        *      > 0:            cached PID of current process
-        *      < 0:            negative number of vforks in progress
-        *      INT_MIN:        for pre-ARMv6, "looking" value (0x80000000)
-        */
-       .long 0
-
-MI_ENTRY_POINT(_getpid)
-       ldr     r3, L__current_pid
-L1:    add     r3, pc, r3              // r3 = &__current_pid
-       ldr     r0, [r3]                // get the cached pid
-       cmp     r0, #0
-       bxgt    lr                      // if positive, return it
-
-       SYSCALL_NONAME(getpid, 0)
-
-#ifdef _ARM_ARCH_6
-       ldrex   r2, [r3]                // see if we can cache it
-       cmp     r2, #0                  // we can't if there are any...
-       bxlt    lr                      // ...vforks in progress
-       strex   r2, r0, [r3]            // ignore conflicts
-#else
-       mov     r1, #0x80000000         // load "looking" value
-       swp     r2, r1, [r3]            // look at the value, lock others out
-       cmp     r2, r1                  // anyone else trying to look?
-       bxeq    lr                      // yes, so return immediately/  
-       cmp     r2, #0                  // see if we can cache it
-       streq   r0, [r3]                // if zero, we can
-       strne   r2, [r3]                // otherwise restore previous value
-#endif
-               
-       bx      lr
-                               
-L__current_pid:        
-       .long   __current_pid - (L1+8)          
-
 #else
 #error Unsupported architecture
 #endif
index aa1a7d1f086a5a747d9409bf22d3bc6126dc7ddd..c43ee761ef11f8f4bb1b6252e8de8ca2ea05376a 100644 (file)
@@ -68,17 +68,6 @@ LABEL(___gettimeofday)
     xorl       %eax, %eax
     ret
 
-#elif defined(__arm__)
-/*
- * This syscall is special cased: the timeval is returned in r0/r1.
- */
-MI_ENTRY_POINT(___gettimeofday)
-    mov     r3, r0                  // save ptr to timeval
-    SYSCALL_NONAME(gettimeofday,2)
-    stmia   r3, { r0, r1 }
-    mov     r0, #0
-    bx      lr
-
 #else
 #error Unsupported architecture
 #endif
index b2d9215a3042d4586737ab947ebc617d66ef31b0..909443b1711a7e4fdefde946c4ef7fe40d6136fb 100644 (file)
@@ -36,10 +36,6 @@ __SYSCALL(__lseek, lseek, 3)
 
 __SYSCALL_INT(__lseek, lseek, 3)
 
-#elif defined(__arm__)
-
-__SYSCALL(__lseek, lseek, 4)
-
 #else
 #error Unsupported architecture
 #endif
index b0eaf9ea2da844583c025114c0963c4a8138f2ea..107a37799f6e51284f6eeb505f79fc13b137af74 100644 (file)
@@ -56,16 +56,6 @@ PSEUDO(__pipe, pipe, 0)
        xorl    %eax, %eax
        ret
 
-#elif defined(__arm__)
-
-MI_ENTRY_POINT(_pipe)
-       mov             r3,r0              // save fildes across syscall
-       SYSCALL_NONAME(pipe, 0)
-       str     r0, [r3, #0]
-       str     r1, [r3, #4]
-       mov             r0,#0
-       bx              lr
-
 #else
 #error Unsupported architecture
 #endif
index 400b754971ea221ae0e2f1b235f51971d02b5deb..2fd53b4604c29760d492e958aa049d54c5e04746 100644 (file)
@@ -58,17 +58,6 @@ LEAF(___ptrace, 0)
 UNIX_SYSCALL_NONAME(ptrace, 4)
        ret
 
-#elif defined(__arm__)
-
-MI_ENTRY_POINT(_ptrace)
-       MI_GET_ADDRESS(ip,_errno)
-       str     r8, [sp, #-4]!
-       mov     r8, #0
-       str     r8, [ip]
-       ldr     r8, [sp], #4    
-       SYSCALL_NONAME(ptrace, 4)
-       bx              lr
-
 #else
 #error Unsupported architecture
 #endif
index f4ce94d63196741e7595620289d954cc528e62fd..514822ba27455b865480ebcf410402580e75d534 100644 (file)
@@ -36,10 +36,6 @@ __SYSCALL(__sigaltstack, sigaltstack, 3)
 
 __SYSCALL_INT(__sigaltstack, sigaltstack, 3)
 
-#elif defined(__arm__)
-
-__SYSCALL(__sigaltstack, sigaltstack, 3)
-
 #else
 #error Unsupported architecture
 #endif
index 64a4adb57452bedfbb44f71b39b06b1ea5274a88..776351abb5f33a836b5a3ef38a4d5db6676bb23b 100644 (file)
@@ -36,10 +36,6 @@ __SYSCALL(__sigreturn, sigreturn, 2)
 
 __SYSCALL_INT(__sigreturn, sigreturn, 2)
 
-#elif defined(__arm__)
-
-__SYSCALL(__sigreturn, sigreturn, 2)
-
 #else
 #error Unsupported architecture
 #endif
index 88f1f08e01f623a4a838a8d4e7ae2c600bdedfb1..dae18a83176fad05c28d909128a3ecc249e78d2e 100644 (file)
@@ -54,10 +54,6 @@ END(___syscall)
 // that value anyway.
 __SYSCALL(__syscall, syscall, 0);
 
-#elif defined(__arm__)
-
-__SYSCALL(__syscall, syscall, 7)
-
 #else
 #error Unsupported architecture
 #endif
index c6e559ccde4387cd8f467032ea7f18f27153c632..dc201e852330f12b624b46d749d945785c4ae6d7 100644 (file)
@@ -176,71 +176,6 @@ L2:
        addq            $1, (%rdx)
        jmp             *%rdi
 
-#elif defined(__arm__)
-
-#include <arm/arch.h>
-               
-       .globl  cerror
-       MI_ENTRY_POINT(_vfork)
-
-       MI_GET_ADDRESS(r3, __current_pid)       // get address of __current_pid
-#ifdef _ARM_ARCH_6
-L0:    
-       ldrex   r1, [r3]
-       subs    r1, r1, #1                      // if __current_pid <= 0, decrement it
-       movpl   r1, #-1                         // otherwise put -1 in there
-       strex   r2, r1, [r3]
-       cmp     r2, #0
-       bne     L0
-#else
-       mov     r2, #0x80000000                 // load "looking" value
-L0:    
-       swp     r1, r2, [r3]                    // look at the value, lock others out
-       cmp     r1, r2                          // anyone else trying to look?
-       beq     L0                              // yes, so wait our turn
-        subs    r1, r1, #1                      // if __current_pid <= 0, decrement it
-       movpl   r1, #-1                         // otherwise put -1 in there
-       str     r1, [r3]
-#endif
-               
-       mov     r1, #1                                  // prime results
-       mov     r12, #SYS_vfork
-       swi     #SWI_SYSCALL                            // make the syscall
-       bcs     Lbotch                                  // error?
-       cmp     r1, #0                                  // parent (r1=0) or child(r1=1)
-       beq     Lparent
-
-       //child here...
-       mov     r0, #0
-       bx      lr                                      // return
-
-Lbotch:
-       MI_CALL_EXTERNAL(cerror)                        // jump here on error
-       mov     r0,#-1                                  // set the error
-       // reload values clobbered by cerror (so we can treat them as live in Lparent)
-       MI_GET_ADDRESS(r3, __current_pid)               // get address of __current_pid
-#ifndef _ARM_ARCH_6
-       mov     r2, #0x80000000                 // load "looking" value
-#endif
-       // fall thru
-       
-Lparent:       
-#ifdef _ARM_ARCH_6
-       ldrex   r1, [r3]
-       add     r1, r1, #1                      // we're back, decrement vfork count
-       strex   r2, r1, [r3]
-       cmp     r2, #0
-       bne     Lparent
-#else
-       swp     r1, r2, [r3]                    // look at the value, lock others out
-       cmp     r1, r2                          // anyone else trying to look?
-       beq     Lparent                         // yes, so wait our turn
-       add     r1, r1, #1                      // we're back, decrement vfork count
-       str     r1, [r3]
-#endif
-
-       bx      lr                                      // return
-
 #else
 #error Unsupported architecture
 #endif
index c18fabc0e547488cc50acba27fd6b730ebef19ec..5f34a7434daee35ecef327610e18351593f1a26e 100644 (file)
@@ -101,20 +101,6 @@ LABEL(cerror)
        movq    $-1,%rdx /* in case a 128-bit value is returned */
        ret
 
-#elif defined(__arm__)
-
-       .globl  _errno
-
-MI_ENTRY_POINT(cerror)
-       stmfd   sp!, {r7, lr}
-       mov             r7, sp
-       MI_GET_ADDRESS(r3,_errno)
-       str             r0, [r3]
-       MI_CALL_EXTERNAL(_cthread_set_errno_self)
-       mov             r0, #-1
-       mov             r1, #-1
-       ldmfd   sp!, {r7, pc}
-
 #else
 #error Unsupported architecture
 #endif
index 13f03940bd045b6cf4e219f0ed572999557f2b65..6af57de1eadc62dc0c2d2517f286e55a62b444e8 100644 (file)
@@ -48,8 +48,6 @@
 #      include <i386/mp.h>     
 #elif defined(__ppc__) || defined(__ppc64__)
 #      include <ppc/cpu_internal.h>
-#elif defined(__arm__)
-#      include <arm/cpu_internal.h>
 #else
 // fall back on declaring it extern.  The linker will sort us out.
 extern unsigned int real_ncpus;
index 876c72513621d398c76b8d2b2e71297c6b4ea760..437c21a01ccf2ec87d3f92591e219a6b1984e88b 100644 (file)
@@ -30,8 +30,6 @@
 #include "ppc/chud_xnu_glue.h"
 #elif defined (__i386__)
 #include "i386/chud_xnu_glue.h"
-#elif defined (__arm__)
-#include "arm/chud_xnu_glue.h"
 #else
 #error architecture not supported
 #endif
index 2908bfccbd51f89db76e04a2c5b60a0ff490a50a..6951cbee3587a73badc10fcccf294632be9ef286 100644 (file)
@@ -37,8 +37,6 @@
 #include "chud/ppc/chud_xnu_private.h"
 #elif defined (__i386__)
 #include "chud/i386/chud_xnu_private.h"
-#elif defined (__arm__)
-#include "chud/arm/chud_xnu_private.h"
 #else
 #error architecture not supported
 #endif
index 667c1323f85751fd4643097231530958e512f244..3e750473e3339d531d19cde8da330160117cd504 100644 (file)
@@ -553,9 +553,6 @@ ppnum_t IOGetLastPageNumber(void)
     for (idx = 0; idx < pmap_memory_region_count; idx++)
     {
        lastPage = pmap_memory_regions[idx].end - 1;
-#elif __arm__
-    if (0) /* XXX */
-    {
 #else
 #error arch
 #endif
index 4aab31696a7972bdccff6780e0492384e5670d1d..c6259eeb091dedda809cc7ebf31c6a4347d86bd4 100644 (file)
@@ -73,16 +73,12 @@ typedef struct {
        int                     (*mach_trap_function)(void);
 #if defined(__i386__)
        boolean_t               mach_trap_stack;
-#elif defined(__arm__)
-       /* no space */
 #else
        mach_munge_t            *mach_trap_arg_munge32; /* system call arguments for 32-bit */
        mach_munge_t            *mach_trap_arg_munge64; /* system call arguments for 64-bit */
 #endif
 #if    !MACH_ASSERT
-#if !defined(__arm__)
        int                     mach_trap_unused;
-#endif
 #else
        const char*             mach_trap_name;
 #endif /* !MACH_ASSERT */
@@ -102,14 +98,6 @@ extern int                  mach_trap_count;
 #define MACH_TRAP(name, arg_count, munge32, munge64)           \
                { (arg_count), (int (*)(void)) (name), FALSE, #name }
 #endif /* !MACH_ASSERT */
-#elif defined(__arm__)
-#if    !MACH_ASSERT
-#define        MACH_TRAP(name, arg_count, munge32, munge64)    \
-               { (arg_count), (int (*)(void)) (name) }
-#else
-#define MACH_TRAP(name, arg_count, munge32, munge64)           \
-               { (arg_count), (int (*)(void)) (name), #name }
-#endif /* !MACH_ASSERT */
 #else  /* !defined(__i386__) */
 #if    !MACH_ASSERT
 #define        MACH_TRAP(name, arg_count, munge32, munge64)    \
index 4a6b16e715274fa238390611b3d0761de57b7080..abe7275543cd1752c61513a657e1aa0717d54359 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/types.h"
 #elif defined (__i386__)
 #include "i386/types.h"
-#elif defined (__arm__)
-#include "arm/types.h"
 #else
 #error architecture not supported
 #endif
index 59e1da299fa236bde653f40d2e02ca4e7be10808..ba98269a5bbe3c48c35bb94aee00a74d8e00ad7e 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/asm.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/asm.h"
-#elif defined (__arm__)
-#include "mach/arm/asm.h"
 #else
 #error architecture not supported
 #endif
index 1bec00d4bc08e7f09bd62fc2143edc550ab846ea..97ffd0766331390797e82b7b5525fa454eeb3b30 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/boolean.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/boolean.h"
-#elif defined (__arm__)
-#include "mach/arm/boolean.h"
 #else
 #error architecture not supported
 #endif
index 5ce83f25424f6636a2ee2188afdfecb524a40860..5fc1486639b9b760f3cb329f97b416fb926e8d3d 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/exception.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/exception.h"
-#elif defined (__arm__)
-#include "mach/arm/exception.h"
 #else
 #error architecture not supported
 #endif
index df37396997355907ae262c191c62fd7dfaa526c7..82c0adf0c03950732bf518ab37608fb392ce39fd 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/kern_return.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/kern_return.h"
-#elif defined (__arm__)
-#include "mach/arm/kern_return.h"
 #else
 #error architecture not supported
 #endif
index a7b5a9bdd1d65d40cbb27137619f2977346c8cf5..10e8e3e2f1dd7a7a2bc6768adc4218ce80724d0d 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/ndr_def.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/ndr_def.h"
-#elif defined (__arm__)
-#include "mach/arm/ndr_def.h"
 #else
 #error architecture not supported
 #endif
index ca9636795c9b7a9675114967ed9b6662a6d77e52..a4c6d639e25ac5c7be7416716dfc5bd747830faa 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/processor_info.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/processor_info.h"
-#elif defined (__arm__)
-#include "mach/arm/processor_info.h"
 #else
 #error architecture not supported
 #endif
index b969bd4d3de8780d73afea7add8206e6f237f377..849260ae47231d28b32e14c6550334edff32e26c 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/rpc.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/rpc.h"
-#elif defined (__arm__)
-#include "mach/arm/rpc.h"
 #else
 #error architecture not supported
 #endif
index a8e1379cdb1a61fa87562b9db00218f35d251270..00069074416405e1cf81f3c92959bb1c798cf59f 100644 (file)
@@ -32,8 +32,6 @@
 #include <mach/ppc/sdt_isa.h>
 #elif defined (__i386__) || defined(__x86_64__)
 #include <mach/i386/sdt_isa.h>
-#elif defined (__arm__)
-#include <mach/arm/sdt_isa.h>
 #else
 #error architecture not supported
 #endif
index e5aaa900a0965be06e7b802551f5938393eadffd..9723317698de5504009c46b7570bf0024d0c23a5 100644 (file)
@@ -35,8 +35,6 @@
 #include "mach/ppc/syscall_sw.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/syscall_sw.h"
-#elif defined (__arm__)
-#include "mach/arm/syscall_sw.h"
 #else
 #error architecture not supported
 #endif
index 18ffca4e54f490cc48a2ed4f79f63cccdc47660b..bf9a155d946bf881cabb669d929dc01feda6f09a 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/thread_state.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/thread_state.h"
-#elif defined (__arm__)
-#include "mach/arm/thread_state.h"
 #else
 #error architecture not supported
 #endif
index ad5eff08f7663a2161687427c35a072c1359bf7f..10ed6899619550e1648164841a9eb075d074ac88 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/thread_status.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/thread_status.h"
-#elif defined (__arm__)
-#include "mach/arm/thread_status.h"
 #else
 #error architecture not supported
 #endif
index c71121b925a3286fc5fcc15b0240486af4c7d36b..685342999f3d460c25e7648fbaa0feff232f298a 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/vm_param.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/vm_param.h"
-#elif defined (__arm__)
-#include "mach/arm/vm_param.h"
 #else
 #error architecture not supported
 #endif
index b36609214e55d9100400bbdf66bf48d4987888b4..a5c4c8ba1c922a6e2cc057ed8f66517e6ef78164 100644 (file)
@@ -33,8 +33,6 @@
 #include "mach/ppc/vm_types.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/vm_types.h"
-#elif defined (__arm__)
-#include "mach/arm/vm_types.h"
 #else
 #error architecture not supported
 #endif
index 2f8346ffc963d49702ba676dd7d03cc3565f2b74..8dc4a261fe869fd844a11793a2b3a0296d2c3948 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/asm.h"
 #elif defined (__i386__)
 #include "i386/asm.h"
-#elif defined (__arm__)
-#include "arm/asm.h"
 #else
 #error architecture not supported
 #endif
index 722602d0e436f593b123fddfb0bef3cf00e406d1..866a1c6069fb65ede85469f1aa76a0241e77995c 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/ast.h"
 #elif defined (__i386__)
 #include "i386/ast.h"
-#elif defined (__arm__)
-#include "arm/ast.h"
 #else
 #error architecture not supported
 #endif
index 97c932d872011e2ea336380e2b682a8bb458afab..604033e353c0c08ab60c74ef25dbc0b0755f0f42 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/ast_types.h"
 #elif defined (__i386__)
 #include "i386/ast_types.h"
-#elif defined (__arm__)
-#include "arm/ast_types.h"
 #else
 #error architecture not supported
 #endif
index 80c9e23db6c4e57ad7426c5745d4a70cf36ff932..226f76cd8c422df71c2a44e9a2d9b1035a247b94 100644 (file)
@@ -33,8 +33,6 @@
 #include "ppc/commpage/commpage.h"
 #elif defined (__i386__)
 #include "i386/commpage/commpage.h"
-#elif defined (__arm__)
-#include "arm/commpage/commpage.h"
 #else
 #error architecture not supported
 #endif
index 7d61bb4455f16fb8cbd85a1e72472eef8ddd2c14..ee32b2748ce500c3a5acf9c656e78f2028a79075 100644 (file)
@@ -34,8 +34,6 @@
 #include "ppc/cpu_affinity.h"
 #elif defined (__i386__)
 #include "i386/cpu_affinity.h"
-#elif defined (__arm__)
-#include "arm/cpu_affinity.h"
 #else
 #error architecture not supported
 #endif
index bfc586bbdaa8584e40912b74550ca425a4576d3a..0dc5d45149d2659713f34f3acae2e1522d9b2ca3 100644 (file)
@@ -35,8 +35,6 @@
 #include "ppc/cpu_capabilities.h"
 #elif defined (__i386__)
 #include "i386/cpu_capabilities.h"
-#elif defined (__arm__)
-#include "arm/cpu_capabilities.h"
 #else
 #error architecture not supported
 #endif
@@ -46,8 +44,6 @@
 #include <System/ppc/cpu_capabilities.h>
 #elif defined (__i386__) || defined(__x86_64__)
 #include <System/i386/cpu_capabilities.h>
-#elif defined (__arm__)
-#include <System/arm/cpu_capabilities.h>
 #else
 #error architecture not supported
 #endif
index ae3f3b616b38e71c5bd6d808e97596cfadb6fd1c..507d487c5567400bbf27955cd247630d52cba851 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/cpu_data.h"
 #elif defined (__i386__)
 #include "i386/cpu_data.h"
-#elif defined (__arm__)
-#include "arm/cpu_data.h"
 #else
 #error architecture not supported
 #endif
index 0097d4562b2d25798fcbd2d37d06fde433978c85..135b6848f33c5f83ace18aa3a72c42b04497cc29 100644 (file)
@@ -34,8 +34,6 @@
 #include "ppc/cpu_number.h"
 #elif defined (__i386__)
 #include "i386/cpu_number.h"
-#elif defined (__arm__)
-#include "arm/cpu_number.h"
 #else
 #error architecture not supported
 #endif
index dd6f51752a0f536cafca89a58dcdf0f7bce78b5b..e935f4f444ccb8cca08a140e64259489da64cae7 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/db_machdep.h"
 #elif defined (__i386__)
 #include "i386/db_machdep.h"
-#elif defined (__arm__)
-#include "arm/db_machdep.h"
 #else
 #error architecture not supported
 #endif
index e292ec80e9d689f99f32760c588d78a913b363dd..a777a649b88eea2a3e264df34921a9415582047c 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/endian.h"
 #elif defined (__i386__)
 #include "i386/endian.h"
-#elif defined (__arm__)
-#include "arm/endian.h"
 #else
 #error architecture not supported
 #endif
index cc084f515bfc6ef85fd86f55710336f8658e17ee..59ac6de808ac2a501ed188b9daf4a767ab6e3134 100644 (file)
@@ -34,8 +34,6 @@
 #include "ppc/io_map_entries.h"
 #elif defined (__i386__)
 #include "i386/io_map_entries.h"
-#elif defined (__arm__)
-#include "arm/io_map_entries.h"
 #else
 #error architecture not supported
 #endif
index 4cf25284cbe94f4f8f8aaa39f98090a55eab2756..7b501e60432baacc4b27a805cce98255c677d578 100644 (file)
@@ -34,8 +34,6 @@
 #include "ppc/lock.h"
 #elif defined (__i386__)
 #include "i386/lock.h"
-#elif defined (__arm__)
-#include "arm/lock.h"
 #else
 #error architecture not supported
 #endif
index eff32fb174ef634d368ca4eb25489a09b4a29068..2a5f21d7842f8de417cd5cfcef682a358d8b87d4 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/locks.h"
 #elif defined (__i386__)
 #include "i386/locks.h"
-#elif defined (__arm__)
-#include "arm/locks.h"
 #else
 #error architecture not supported
 #endif
index 059d0eaf156c2765407f9982f679203f9a05081b..dbcc4d0069bdda900aea1b889156af1b178012b8 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/machine_cpu.h"
 #elif defined (__i386__)
 #include "i386/machine_cpu.h"
-#elif defined (__arm__)
-#include "arm/machine_cpu.h"
 #else
 #error architecture not supported
 #endif
index 00dfc3216f4a91e0a15416f90a10a4d507abd1a4..4a99e78fc76add621a643e26d496ac95b75dac4c 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/machine_routines.h"
 #elif defined (__i386__)
 #include "i386/machine_routines.h"
-#elif defined (__arm__)
-#include "arm/machine_routines.h"
 #else
 #error architecture not supported
 #endif
index 9307c9191364b2d578052ad9ab80e6a3b8311719..4dd1ed876a3577b07a77e60db01145022911790f 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/machine_rpc.h"
 #elif defined (__i386__)
 #include "i386/machine_rpc.h"
-#elif defined (__arm__)
-#include "arm/machine_rpc.h"
 #else
 #error architecture not supported
 #endif
index 5b970101cd9e81f2fcb3cbe04c74e6eae2de5fe5..dd46d4f4f94dcb0c3d8f37916213bfe17f0de595 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/machlimits.h"
 #elif defined (__i386__)
 #include "i386/machlimits.h"
-#elif defined (__arm__)
-#include "arm/machlimits.h"
 #else
 #error architecture not supported
 #endif
index 02ddd8c341d47e74cda7d5e6800566c74608fd4c..42de1defc42b3aafcd3bb1a9c07408d84766b4cd 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/machparam.h"
 #elif defined (__i386__)
 #include "i386/machparam.h"
-#elif defined (__arm__)
-#include "arm/machparam.h"
 #else
 #error architecture not supported
 #endif
index 3363363090173b2a9e675df1c5301d3d04a8c48a..c9a1a00d85da84b0ae6935838f3ad9927a4a5039 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/pmap.h"
 #elif defined (__i386__)
 #include "i386/pmap.h"
-#elif defined (__arm__)
-#include "arm/pmap.h"
 #else
 #error architecture not supported
 #endif
index 082690f0abc7589a0044a7d4c1e0df3c0ffeb904..426f9698aef8cbe6e6b652be9bf4e35c7cdafc64 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/sched_param.h"
 #elif defined (__i386__)
 #include "i386/sched_param.h"
-#elif defined (__arm__)
-#include "arm/sched_param.h"
 #else
 #error architecture not supported
 #endif
index 08a73f43a2f19695741949b9eddf8dc5fd8c0750..89064d8c54bad429c3bcb4f6606fc62a5e6d74a8 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/setjmp.h"
 #elif defined (__i386__)
 #include "i386/setjmp.h"
-#elif defined (__arm__)
-#include "arm/setjmp.h"
 #else
 #error architecture not supported
 #endif
index 67456c61d98cd786f76829c8e738542032a36a14..e265f398bd048ac68cb9baef1c237d665738d7b3 100644 (file)
@@ -34,8 +34,6 @@
 #include "ppc/simple_lock.h"
 #elif defined (__i386__)
 #include "i386/simple_lock.h"
-#elif defined (__arm__)
-#include "arm/simple_lock.h"
 #else
 #error architecture not supported
 #endif
index f39e0adbec60c45a9f7f9a31ea8d837c9b76413c..a94687c8188689686b6bc998d5ca16f16d85b4ad 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/task.h"
 #elif defined (__i386__)
 #include "i386/task.h"
-#elif defined (__arm__)
-#include "arm/task.h"
 #else
 #error architecture not supported
 #endif
index 2b6153bd45efe06e638ff76857754130265dd482..35f964d52fcf45ae515d177162ba700633312b72 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/thread.h"
 #elif defined (__i386__)
 #include "i386/thread.h"
-#elif defined (__arm__)
-#include "arm/thread.h"
 #else
 #error architecture not supported
 #endif
index d39778ed9a07db78fb7e17cce95d2007b62af67f..e6b145be9e0707efc00878f142a223d9b5bf9705 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/timer.h"
 #elif defined (__i386__)
 #include "i386/timer.h"
-#elif defined (__arm__)
-#include "arm/timer.h"
 #else
 #error architecture not supported
 #endif
index 737682fece28932708d43685cd403e6d005e7d92..046f216bae9f362537137c48c337d5e2ad1da5aa 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/trap.h"
 #elif defined (__i386__)
 #include "i386/trap.h"
-#elif defined (__arm__)
-#include "arm/trap.h"
 #else
 #error architecture not supported
 #endif
index 00c50d283838e97816175ff7ef8edc2e2b831874..203708bc51765dafaea03e5cbe5be49ee43177eb 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/vm_tuning.h"
 #elif defined (__i386__)
 #include "i386/vm_tuning.h"
-#elif defined (__arm__)
-#include "arm/vm_tuning.h"
 #else
 #error architecture not supported
 #endif
index a5b64812d7af9e22b8be266b046129b46e376d27..a748503105aa0672f9c5dbefcde3d6c5a96398ba 100644 (file)
@@ -32,8 +32,6 @@
 #include "ppc/xpr.h"
 #elif defined (__i386__)
 #include "i386/xpr.h"
-#elif defined (__arm__)
-#include "arm/xpr.h"
 #else
 #error architecture not supported
 #endif
index ec48f8f8d82234c50edfd24c111f3a9f820ba573..b1c30115b314f17addf6a03bf0176adb777be507 100644 (file)
@@ -32,8 +32,6 @@
 #include "profiling/ppc/profile-md.h"
 #elif defined (__i386__)
 #include "profiling/i386/profile-md.h"
-#elif defined (__arm__)
-#include "profiling/arm/profile-md.h"
 #else
 #error architecture not supported
 #endif
index 97edae887f81056ddf6b0cda5c5243ae9aaef53f..e78f39c3423f296265ba834cd0da743380b65e19 100644 (file)
@@ -32,8 +32,6 @@
 #include "pexpert/ppc/boot.h"
 #elif defined (__i386__)
 #include "pexpert/i386/boot.h"
-#elif defined (__arm__)
-#include "pexpert/arm/boot.h"
 #else
 #error architecture not supported
 #endif
index 7412f19e8b447da78d0bdf4b1f8ecb2ffd2e4602..3735c930b303fa3eaa78a171345204f00c80761a 100644 (file)
@@ -32,8 +32,6 @@
 #include "pexpert/ppc/protos.h"
 #elif defined (__i386__)
 #include "pexpert/i386/protos.h"
-#elif defined (__arm__)
-#include "pexpert/arm/protos.h"
 #else
 #error architecture not supported
 #endif