diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-12 11:39:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-12 11:39:49 +1000 |
| commit | b59f78228ca3d81ecb491fb17d348b07002dbe03 (patch) | |
| tree | d3600fbc2382128962fefb24e2d956f1fee0803a /kernel | |
| parent | f41c2581bc2b6b21f774596845952a7cb4c15c74 (diff) | |
| parent | 9f49c37635d5c2a801f7670d5fbf0b25ec461f2c (diff) | |
| download | op-kernel-dev-b59f78228ca3d81ecb491fb17d348b07002dbe03.zip op-kernel-dev-b59f78228ca3d81ecb491fb17d348b07002dbe03.tar.gz | |
Merge tag 'drm-intel-next-fixes-2014-12-11' of git://anongit.freedesktop.org/drm-intel into drm-next
Here's a batch of i915 fixes for 3.19.
* tag 'drm-intel-next-fixes-2014-12-11' of git://anongit.freedesktop.org/drm-intel:
drm/i915: save/restore GMBUS freq across suspend/resume on gen4
drm/i915: Remove '& 0xffff' from the mask given to WA_REG()
drm/i915: Invert the mask and val arguments in wa_add() and WA_REG()
drm/i915/bdw: Fix the write setting up the WIZ hashing mode
drm/i915: Don't complain about stolen conflicts on gen3
drm/i915: resume MST after reading back hw state
drm/i915: Handle inaccurate time conversion issues
drm/i915: compute wait_ioctl timeout correctly
drm/i915: don't always do full mode sets when infoframes are enabled
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/time.c b/kernel/time/time.c index a9ae20f..8fae82c 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -745,6 +745,7 @@ u64 nsecs_to_jiffies64(u64 n) return div_u64(n * 9, (9ull * NSEC_PER_SEC + HZ / 2) / HZ); #endif } +EXPORT_SYMBOL(nsecs_to_jiffies64); /** * nsecs_to_jiffies - Convert nsecs in u64 to jiffies |
