diff --git a/[refs] b/[refs] index 883f4b026674..68b585563819 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 038f7d0027d208df8fd59f5ff2bcf5c2d2fbba3f +refs/heads/master: 2770f189b7a5582869c137e5617fb88cc0ad0fd3 diff --git a/trunk/Documentation/DocBook/kernel-hacking.tmpl b/trunk/Documentation/DocBook/kernel-hacking.tmpl index 992e67e6be7f..7b3f49363413 100644 --- a/trunk/Documentation/DocBook/kernel-hacking.tmpl +++ b/trunk/Documentation/DocBook/kernel-hacking.tmpl @@ -352,7 +352,7 @@ asmlinkage long sys_mycall(int arg) -if (signal_pending()) +if (signal_pending(current)) return -ERESTARTSYS;