1. 08 Jan, 2020 9 commits
    • Daniel W. S. Almeida's avatar
      media: as102: improve formatting · 98b38bb4
      Daniel W. S. Almeida authored
      This patch fixes the following scripts/checkpatch.pl error:
      
      ERROR: open brace '{' following function definitions go on the next line
      +static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
      +			struct dvb_frontend_tune_settings *settings) {
      Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      98b38bb4
    • Daniel W. S. Almeida's avatar
      media: dvb_dummy_fe: change printk to pr_warn · 02a5830f
      Daniel W. S. Almeida authored
      Replaces printk with pr_err to fix warnings from checkpatch.pl
      Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      02a5830f
    • Daniel W. S. Almeida's avatar
      media: dvb_dummy_fe: Add blank line after declaration · 60c2b606
      Daniel W. S. Almeida authored
      Fix checkpatch.pl error by adding a blank line
      Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      60c2b606
    • Daniel W. S. Almeida's avatar
      media: dvb_dummy_fe: Fix ERROR: POINTER_LOCATION, AVOID_EXTERN and long lines · 6a168c6c
      Daniel W. S. Almeida authored
      Change foo* bar to foo *bar to avoid ERROR: POINTER_LOCATION in checkpatch
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_read_snr(struct dvb_frontend* fe, u16* snr)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_read_snr(struct dvb_frontend* fe, u16* snr)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_sleep(struct dvb_frontend* fe)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static int dvb_dummy_fe_init(struct dvb_frontend* fe)
      
      ERROR: "foo* bar" should be "foo *bar"
      +static void dvb_dummy_fe_release(struct dvb_frontend* fe)
      
      ERROR: "foo* bar" should be "foo *bar"
      +	struct dvb_dummy_fe_state* state = fe->demodulator_priv;
      
      ERROR: "foo* bar" should be "foo *bar"
      +struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void)
      
      ERROR: "foo* bar" should be "foo *bar"
      +	struct dvb_dummy_fe_state* state = NULL;
      
      ERROR: "foo* bar" should be "foo *bar"
      +	struct dvb_dummy_fe_state* state = NULL;
      
      ERROR: "foo* bar" should be "foo *bar"
      +	struct dvb_dummy_fe_state* state = NULL;
      
      remove 'extern' keyword from declaration
      
      Fix CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files
      by removing it.
      
      Fix long lines
      
      Break long lines into smaller ones to improve readability.
      
      WARNING: line over 80 characters
      +	memcpy(&state->frontend.ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));
      
      WARNING: line over 80 characters
      +	memcpy(&state->frontend.ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));
      WARNING: line over 80 characters
      +	memcpy(&state->frontend.ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));
      
      WARNING: line over 80 characters
      +				FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
      
      WARNING: line over 80 characters
      +				FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
      
      WARNING: line over 80 characters
      +				FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
      
      WARNING: line over 80 characters
      +		.symbol_rate_min	= (57840000 / 2) / 6
      Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
      Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      6a168c6c
    • Sean Young's avatar
      media: dib0090: incorrect format specifier detected by clang · 9fcfae8a
      Sean Young authored
      drivers/media/dvb-frontends/dib0090.c:1751:67: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("BB Offset Cal, BBreg=%hd,Offset=%hd,Value Set=%hd\n", state->dc->addr, state->adc_diff, state->step);
                                                            ~~~                              ^~~~~~~~~~~~~~~
                                                            %hhu
      drivers/media/dvb-frontends/dib0090.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0090.c:1751:101: warning: format specifies type 'short' but the argument has type 's8' (aka 'signed char') [-Wformat]
                              dprintk("BB Offset Cal, BBreg=%hd,Offset=%hd,Value Set=%hd\n", state->dc->addr, state->adc_diff, state->step);
                                                                                     ~~~                                       ^~~~~~~~~~~
                                                                                     %hhd
      drivers/media/dvb-frontends/dib0090.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      9fcfae8a
    • Sean Young's avatar
      media: dib0070: incorrect format specifiers detected by clang · f54def5b
      Sean Young authored
      drivers/media/dvb-frontends/dib0070.c:192:52: warning: format specifies type 'short' but the argument has type 's8' (aka 'signed char') [-Wformat]
                      dprintk("CAPTRIM=%hd; ADC = %hd (ADC) & %dmV\n", state->captrim, adc, (u32) adc*(u32)1800/(u32)1024);
                                       ~~~                             ^~~~~~~~~~~~~~
                                       %hhd
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:203:59: warning: format specifies type 'short' but the argument has type 's8' (aka 'signed char') [-Wformat]
                              dprintk("CAPTRIM=%hd is closer to target (%hd/%hd)\n", state->captrim, adc, state->adc_diff);
                                               ~~~                                   ^~~~~~~~~~~~~~
                                               %hhd
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:367:46: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                      dprintk("Tuning for Band: %hd (%d kHz)\n", band, freq);
                                                ~~~              ^~~~
                                                %hhu
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:445:39: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("REFDIV: %hd, FREF: %d\n", REFDIV, FREF);
                                               ~~~               ^~~~~~
                                               %hhu
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:447:57: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("Num: %hd, Den: %hd, SD: %hd\n", (u16) Rest, Den, (state->lo4 >> 12) & 0x1);
                                                      ~~~                          ^~~
                                                      %hhu
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:447:62: warning: format specifies type 'short' but the argument has type 'int' [-Wformat]
                              dprintk("Num: %hd, Den: %hd, SD: %hd\n", (u16) Rest, Den, (state->lo4 >> 12) & 0x1);
                                                               ~~~                      ^~~~~~~~~~~~~~~~~~~~~~~~
                                                               %d
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:448:33: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("HFDIV code: %hd\n", state->current_tune_table_index->hfdiv);
                                                   ~~~     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                   %hhu
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:449:27: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("VCO = %hd\n", state->current_tune_table_index->vco_band);
                                             ~~~     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                             %hhu
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      drivers/media/dvb-frontends/dib0070.c:450:40: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("VCOF: ((%hd*%d) << 1))\n", state->current_tune_table_index->vco_multi, freq);
                                               ~~~                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                               %hhu
      drivers/media/dvb-frontends/dib0070.c:30:22: note: expanded from macro 'dprintk'
                             __func__, ##arg);                                \
                                         ^~~
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      f54def5b
    • Sean Young's avatar
      media: dib7000p: incorrect format specifier detected by clang · 4ec14f24
      Sean Young authored
      drivers/media/dvb-frontends/dib7000p.c:918:37: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                      dprintk("SPLIT %p: %hd\n", demod, agc_split);
                                         ~~~            ^~~~~~~~~
                                         %hhu
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      4ec14f24
    • Sean Young's avatar
      media: dib7000m: incorrect format specifier detected by clang · cfff5818
      Sean Young authored
      drivers/media/dvb-frontends/dib7000m.c:811:38: warning: format specifies type 'short' but the argument has type 'u8' (aka 'unsigned char') [-Wformat]
                              dprintk("SPLIT %p: %hd\n", demod, agc_split);
                                                 ~~~            ^~~~~~~~~
                                                 %hhu
      Signed-off-by: default avatarSean Young <sean@mess.org>
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
      cfff5818
    • Mauro Carvalho Chehab's avatar
      Merge tag 'v5.5-rc5' into patchwork · 8821e928
      Mauro Carvalho Chehab authored
      Linux 5.5-rc5
      
      * tag 'v5.5-rc5': (1006 commits)
        Linux 5.5-rc5
        Documentation: riscv: add patch acceptance guidelines
        riscv: prefix IRQ_ macro names with an RV_ namespace
        clocksource: riscv: add notrace to riscv_sched_clock
        apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock
        hexagon: define ioremap_uc
        ocfs2: fix the crash due to call ocfs2_get_dlm_debug once less
        ocfs2: call journal flush to mark journal as empty after journal recovery when mount
        mm/hugetlb: defer freeing of huge pages if in non-task context
        mm/gup: fix memory leak in __gup_benchmark_ioctl
        mm/oom: fix pgtables units mismatch in Killed process message
        fs/posix_acl.c: fix kernel-doc warnings
        hexagon: work around compiler crash
        hexagon: parenthesize registers in asm predicates
        fs/namespace.c: make to_mnt_ns() static
        fs/nsfs.c: include headers for missing declarations
        fs/direct-io.c: include fs/internal.h for missing prototype
        mm: move_pages: return valid node id in status if the page is already on the target node
        memcg: account security cred as well to kmemcg
        kcov: fix struct layout for kcov_remote_arg
        ...
      8821e928
  2. 05 Jan, 2020 7 commits
    • Linus Torvalds's avatar
      Linux 5.5-rc5 · c79f46a2
      Linus Torvalds authored
      c79f46a2
    • Linus Torvalds's avatar
      Merge tag 'riscv/for-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · 768fc661
      Linus Torvalds authored
      Pull RISC-V fixes from Paul Walmsley:
       "Several fixes for RISC-V:
      
         - Fix function graph trace support
      
         - Prefix the CSR IRQ_* macro names with "RV_", to avoid collisions
           with macros elsewhere in the Linux kernel tree named "IRQ_TIMER"
      
         - Use __pa_symbol() when computing the physical address of a kernel
           symbol, rather than __pa()
      
         - Mark the RISC-V port as supporting GCOV
      
        One DT addition:
      
         - Describe the L2 cache controller in the FU540 DT file
      
        One documentation update:
      
         - Add patch acceptance guideline documentation"
      
      * tag 'riscv/for-v5.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        Documentation: riscv: add patch acceptance guidelines
        riscv: prefix IRQ_ macro names with an RV_ namespace
        clocksource: riscv: add notrace to riscv_sched_clock
        riscv: ftrace: correct the condition logic in function graph tracer
        riscv: dts: Add DT support for SiFive L2 cache controller
        riscv: gcov: enable gcov for RISC-V
        riscv: mm: use __pa_symbol for kernel symbols
      768fc661
    • Paul Walmsley's avatar
      Documentation: riscv: add patch acceptance guidelines · 0e194d9d
      Paul Walmsley authored
      Formalize, in kernel documentation, the patch acceptance policy for
      arch/riscv.  In summary, it states that as maintainers, we plan to
      only accept patches for new modules or extensions that have been
      frozen or ratified by the RISC-V Foundation.
      
      We've been following these guidelines for the past few months.  In the
      meantime, we've received quite a bit of feedback that it would be
      helpful to have these guidelines formally documented.
      
      Based on a suggestion from Matthew Wilcox, we also add a link to this
      file to Documentation/process/index.rst, to make this document easier
      to find.  The format of this document has also been changed to align
      to the format outlined in the maintainer entry profiles, in accordance
      with comments from Jon Corbet and Dan Williams.
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      Reviewed-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
      Cc: Palmer Dabbelt <palmer@dabbelt.com>
      Cc: Albert Ou <aou@eecs.berkeley.edu>
      Cc: Krste Asanovic <krste@berkeley.edu>
      Cc: Andrew Waterman <waterman@eecs.berkeley.edu>
      Cc: Matthew Wilcox <willy@infradead.org>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Cc: Jonathan Corbet <corbet@lwn.net>
      0e194d9d
    • Paul Walmsley's avatar
      riscv: prefix IRQ_ macro names with an RV_ namespace · 2f3035da
      Paul Walmsley authored
      "IRQ_TIMER", used in the arch/riscv CSR header file, is a sufficiently
      generic macro name that it's used by several source files across the
      Linux code base.  Some of these other files ultimately include the
      arch/riscv CSR include file, causing collisions.  Fix by prefixing the
      RISC-V csr.h IRQ_ macro names with an RV_ prefix.
      
      Fixes: a4c3733d ("riscv: abstract out CSR names for supervisor vs machine mode")
      Reported-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      2f3035da
    • Zong Li's avatar
      clocksource: riscv: add notrace to riscv_sched_clock · 9d05c18e
      Zong Li authored
      When enabling ftrace graph tracer, it gets the tracing clock in
      ftrace_push_return_trace().  Eventually, it invokes riscv_sched_clock()
      to get the clock value.  If riscv_sched_clock() isn't marked with
      'notrace', it will call ftrace_push_return_trace() and cause infinite
      loop.
      
      The result of failure as follow:
      
      command: echo function_graph >current_tracer
      [   46.176787] Unable to handle kernel paging request at virtual address ffffffe04fb38c48
      [   46.177309] Oops [#1]
      [   46.177478] Modules linked in:
      [   46.177770] CPU: 0 PID: 256 Comm: $d Not tainted 5.5.0-rc1 #47
      [   46.177981] epc: ffffffe00035e59a ra : ffffffe00035e57e sp : ffffffe03a7569b0
      [   46.178216]  gp : ffffffe000d29b90 tp : ffffffe03a756180 t0 : ffffffe03a756968
      [   46.178430]  t1 : ffffffe00087f408 t2 : ffffffe03a7569a0 s0 : ffffffe03a7569f0
      [   46.178643]  s1 : ffffffe00087f408 a0 : 0000000ac054cda4 a1 : 000000000087f411
      [   46.178856]  a2 : 0000000ac054cda4 a3 : 0000000000373ca0 a4 : ffffffe04fb38c48
      [   46.179099]  a5 : 00000000153e22a8 a6 : 00000000005522ff a7 : 0000000000000005
      [   46.179338]  s2 : ffffffe03a756a90 s3 : ffffffe00032811c s4 : ffffffe03a756a58
      [   46.179570]  s5 : ffffffe000d29fe0 s6 : 0000000000000001 s7 : 0000000000000003
      [   46.179809]  s8 : 0000000000000003 s9 : 0000000000000002 s10: 0000000000000004
      [   46.180053]  s11: 0000000000000000 t3 : 0000003fc815749c t4 : 00000000000efc90
      [   46.180293]  t5 : ffffffe000d29658 t6 : 0000000000040000
      [   46.180482] status: 0000000000000100 badaddr: ffffffe04fb38c48 cause: 000000000000000f
      Signed-off-by: default avatarZong Li <zong.li@sifive.com>
      Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
      [paul.walmsley@sifive.com: cleaned up patch description]
      Fixes: 92e0d143 ("clocksource/drivers/riscv_timer: Provide the sched_clock")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarPaul Walmsley <paul.walmsley@sifive.com>
      9d05c18e
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 36487907
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "17 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        hexagon: define ioremap_uc
        ocfs2: fix the crash due to call ocfs2_get_dlm_debug once less
        ocfs2: call journal flush to mark journal as empty after journal recovery when mount
        mm/hugetlb: defer freeing of huge pages if in non-task context
        mm/gup: fix memory leak in __gup_benchmark_ioctl
        mm/oom: fix pgtables units mismatch in Killed process message
        fs/posix_acl.c: fix kernel-doc warnings
        hexagon: work around compiler crash
        hexagon: parenthesize registers in asm predicates
        fs/namespace.c: make to_mnt_ns() static
        fs/nsfs.c: include headers for missing declarations
        fs/direct-io.c: include fs/internal.h for missing prototype
        mm: move_pages: return valid node id in status if the page is already on the target node
        memcg: account security cred as well to kmemcg
        kcov: fix struct layout for kcov_remote_arg
        mm/zsmalloc.c: fix the migrated zspage statistics.
        mm/memory_hotplug: shrink zones when offlining memory
      36487907
    • Linus Torvalds's avatar
      Merge tag 'apparmor-pr-2020-01-04' of... · a125bcda
      Linus Torvalds authored
      Merge tag 'apparmor-pr-2020-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
      
      Pull apparmor fixes from John Johansen:
      
       - performance regression: only get a label reference if the fast path
         check fails
      
       - fix aa_xattrs_match() may sleep while holding a RCU lock
      
       - fix bind mounts aborting with -ENOMEM
      
      * tag 'apparmor-pr-2020-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
        apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock
        apparmor: only get a label reference if the fast path check fails
        apparmor: fix bind mounts aborting with -ENOMEM
      a125bcda
  3. 04 Jan, 2020 24 commits