diff options
author | Dave Airlie <airlied@redhat.com> | 2013-10-22 07:32:40 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-10-22 07:32:40 +0100 |
commit | 3bcec5f076688c58436a6c354f5b94eef16469da (patch) | |
tree | 6e50e1c03d52bffbd17b16dd6b153a428f0b9e7c /init/main.c | |
parent | drm: Pad drm_mode_get_connector to 64-bit boundary (diff) | |
parent | drm/i915: Disable GGTT PTEs on GEN6+ suspend (diff) | |
download | linux-dev-3bcec5f076688c58436a6c354f5b94eef16469da.tar.xz linux-dev-3bcec5f076688c58436a6c354f5b94eef16469da.zip |
Merge tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Just an lvds clock gating fix and a pte clearing hack for hsw to avoid
memory corruption when hibernating - something doesn't seem to switch off
properly, we're still investigating.
* tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel: (96 commits)
drm/i915: Disable GGTT PTEs on GEN6+ suspend
drm/i915: Make PTE valid encoding optional
drm/i915: disable LVDS clock gating on CPT v2
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index af310afbef28..63d3e8f2970c 100644 --- a/init/main.c +++ b/init/main.c @@ -76,6 +76,7 @@ #include <linux/elevator.h> #include <linux/sched_clock.h> #include <linux/context_tracking.h> +#include <linux/random.h> #include <asm/io.h> #include <asm/bugs.h> @@ -780,6 +781,7 @@ static void __init do_basic_setup(void) do_ctors(); usermodehelper_enable(); do_initcalls(); + random_int_secret_init(); } static void __init do_pre_smp_initcalls(void) |