diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-08-02 11:55:31 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-08-02 15:28:39 -0400 |
| commit | 8233ede2882d7090eec1a1e0b5d7e53b0575f327 (patch) | |
| tree | 644b09fd2c3080096836cf4a57ee806fecb4b584 /scripts | |
| parent | 32a32ba43387e6ad9dd74f38b79ad411c6c1c4e6 (diff) | |
| parent | f1e79c6abb1e5420fb35e9e8a634efec9fc9ba96 (diff) | |
Merge tag 'v3.2.24' into v3.2-rt
This is the 3.2.24 stable release
Conflicts:
kernel/hrtimer.c
kernel/time/ntp.c
kernel/time/timekeeping.c
Needed to add:
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 03493fd..991259a 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1269,7 +1269,7 @@ ktime_t ktime_get_update_offsets(ktime_t *real, ktime_t *boot)
u64 secs, nsecs;
do {
- seq = read_seqbegin(&xtime_lock);
+ seq = read_seqcount_begin(&xtime_seq);
secs = xtime.tv_sec;
nsecs = xtime.tv_nsec;
@@ -1279,7 +1279,7 @@ ktime_t ktime_get_update_offsets(ktime_t *real, ktime_t *boot)
*real = offs_real;
*boot = offs_boot;
- } while (read_seqretry(&xtime_lock, seq));
+ } while (read_seqcount_retry(&xtime_seq, seq));
now = ktime_add_ns(ktime_set(secs, 0), nsecs);
now = ktime_sub(now, *real);
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/depmod.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh index a27235685949..2ae481703141 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -9,12 +9,6 @@ fi DEPMOD=$1 KERNELRELEASE=$2 -if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then - echo "Warning: you may need to install module-init-tools" >&2 - echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2 - sleep 1 -fi - if ! test -r System.map -a -x "$DEPMOD"; then exit 0 fi |