← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to arch/x86/lib/delay.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings, Ben Hutchings
  • Date: 2012-03-21 03:08:36 UTC
  • mfrom: (1.2.34)
  • Revision ID: package-import@ubuntu.com-20120321030836-rvavg03lkz15wj2q
Tags: 3.3-1~experimental.1
http://bugs.debian.org/663041
* New upstream release: http://kernelnewbies.org/Linux_3.3

[ Ben Hutchings ]
* [x86] crypto: Enable CRYPTO_SERPENT_SSE2_586, CRYPTO_SERPENT_SSE2_X86_64
* aufs: Update to aufs3.x-rcN-20120312
* IB: Enable INFINIBAND_SRPT as module (Closes: #663041)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/lib/delay.c
48
48
}
49
49
 
50
50
/* TSC based delay: */
51
 
static void delay_tsc(unsigned long loops)
 
51
static void delay_tsc(unsigned long __loops)
52
52
{
53
 
        unsigned long bclock, now;
 
53
        u32 bclock, now, loops = __loops;
54
54
        int cpu;
55
55
 
56
56
        preempt_disable();