xnu-1228.5.18.tar.gz

[apple/xnu.git] / osfmk / i386 / hpet.c

diff --git a/osfmk/i386/hpet.c b/osfmk/i386/hpet.c
index 5ae9621d52d8dbc20d304fdf936dde3921c17ccf..940a7c649fd62944bbf8641acc86a3968470b768 100644 (file)
--- a/osfmk/i386/hpet.c
+++ b/osfmk/i386/hpet.c
@@ -133,6 +133,26 @@ hpet_request(uint32_t cpu)
        return(-1);
     }
 
+    /*
+     * Deal with the case where the CPU # passed in is past the
+     * value specified in cpus=n in boot-args.
+     */
+    if (cpu >= real_ncpus) {
+       enabled = ml_set_interrupts_enabled(FALSE);
+       lcpu = cpu_to_lcpu(cpu);
+       if (lcpu != NULL) {
+           core = lcpu->core;
+           pkg  = core->package;
+
+           if (lcpu->primary) {
+               pkg->flags |= X86PKG_FL_HAS_HPET;
+           }
+       }
+
+       ml_set_interrupts_enabled(enabled);
+       return(0);
+    }
+
     rc = (*hpet_req)(ml_get_apicid(cpu), hpet_arg, &hpetReq);
     if (rc != 0) {
        return(rc);