Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f49309a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull misc kbuild updates:
 "This is the remaining part of kbuild stuff for v4.1-rc1:

   - One wew coccinelle script and a clarification of the proposed fix
     in bugon.coccinelle

   - CONFIG_KERNEL_LZ4 support for extract-ikconfig"

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/coccinelle/misc/bugon.cocci: update bug_on conversion warning
  scripts/extract-ikconfig: Support LZ4-compressed images.
  irqf_oneshot.cocci: add check of devm_request_threaded_irq()
parents b153f1d3 33236415

scripts/coccinelle/misc/irqf_oneshot.cocci

+24 −0
Original line number Diff line number Diff line
@@ -12,11 +12,13 @@ virtual org 
virtual report



@r1@

expression dev;

expression irq;

expression thread_fn;

expression flags;

position p;

@@

(

request_threaded_irq@p(irq, NULL, thread_fn,

(

flags | IRQF_ONESHOT
@@ -24,13 +26,24 @@ flags | IRQF_ONESHOT 
IRQF_ONESHOT

)

, ...)

|

devm_request_threaded_irq@p(dev, irq, NULL, thread_fn,

(

flags | IRQF_ONESHOT

|

IRQF_ONESHOT

)

, ...)

)



@depends on patch@

expression dev;

expression irq;

expression thread_fn;

expression flags;

position p != r1.p;

@@

(

request_threaded_irq@p(irq, NULL, thread_fn,

(

-0
@@ -40,6 +53,17 @@ request_threaded_irq@p(irq, NULL, thread_fn, 
+flags | IRQF_ONESHOT

)

, ...)

|

devm_request_threaded_irq@p(dev, irq, NULL, thread_fn,

(

-0

+IRQF_ONESHOT

|

-flags

+flags | IRQF_ONESHOT

)

, ...)

)



@depends on context@

position p != r1.p;

scripts/extract-ikconfig

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ try_decompress '\3757zXZ\000' abcde unxz 
try_decompress 'BZh'          xy    bunzip2

try_decompress '\135\0\0\0'   xxx   unlzma

try_decompress '\211\114\132' xy    'lzop -d'

try_decompress '\002\041\114\030' xyy 'lz4 -d -l'



# Bail out:

echo "$me: Cannot find kernel config." >&2