← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/x86/include/asm/pvclock.h

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/include/asm/pvclock.h
44
44
                : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
45
45
#elif defined(__x86_64__)
46
46
        __asm__ (
47
 
                "mul %[mul_frac] ; shrd $32, %[hi], %[lo]"
 
47
                "mulq %[mul_frac] ; shrd $32, %[hi], %[lo]"
48
48
                : [lo]"=a"(product),
49
49
                  [hi]"=d"(tmp)
50
50
                : "0"(delta),