These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / arch / i386 / core / rdtsc_timer.c

diff --git a/qemu/roms/ipxe/src/arch/i386/core/rdtsc_timer.c b/qemu/roms/ipxe/src/arch/i386/core/rdtsc_timer.c
index 2f31afc..e720a23 100644 (file)
--- a/qemu/roms/ipxe/src/arch/i386/core/rdtsc_timer.c
+++ b/qemu/roms/ipxe/src/arch/i386/core/rdtsc_timer.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 /** @file
  *
@@ -27,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <assert.h>
 #include <ipxe/timer.h>
-#include <ipxe/timer2.h>
+#include <ipxe/pit8254.h>
 
 /**
  * Number of TSC ticks per microsecond
@@ -56,10 +60,10 @@ static void rdtsc_udelay ( unsigned long usecs ) {
                        elapsed = ( currticks() - start );
                } while ( elapsed < ( usecs * rdtsc_ticks_per_usec ) );
        } else {
-               /* Not yet calibrated; use timer2 and calibrate
+               /* Not yet calibrated; use 8254 PIT and calibrate
                 * based on result.
                 */
-               timer2_udelay ( usecs );
+               pit8254_udelay ( usecs );
                elapsed = ( currticks() - start );
                rdtsc_ticks_per_usec = ( elapsed / usecs );
                DBG ( "RDTSC timer calibrated: %ld ticks in %ld usecs "