[PATCH] fix double ;;s in code
Fix double ;;'s in code. Signed-off-by: Pavel Machek diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index 9d27331..ec12fe1 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -373,7 +373,7 @@ static void arc_chk_core_config(void) { struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()]; int saved = 0, present = 0; - char *opt_nm = NULL;; + char *opt_nm = NULL; if (!cpu->extn.timer0) panic("Timer0 is not present!\n"); diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 333daab..183391d 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -366,7 +366,7 @@ static void init_unwind_hdr(struct unwind_table *table, return; ret_err: - panic("Attention !!! Dwarf FDE parsing errors\n");; + panic("Attention !!! Dwarf FDE parsing errors\n"); } #ifdef CONFIG_MODULES diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 629f8e9..cf2701c 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -83,7 +83,7 @@ static void dummy_clock_access(struct timespec64 *ts) } static clock_access_fn __read_persistent_clock = dummy_clock_access; -static clock_access_fn __read_boot_clock = dummy_clock_access;; +static clock_access_fn __read_boot_clock = dummy_clock_access; void read_persistent_clock64(struct timespec64 *ts) { diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 6618036..9ae31f7 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -1419,7 +1419,7 @@ static int compat_ptrace_hbp_get(unsigned int note_type, u64 addr = 0; u32 ctrl = 0; - int err, idx = compat_ptrace_hbp_num_to_idx(num);; + int err, idx = compat_ptrace_hbp_num_to_idx(num); if (num & 1) { err = ptrace_hbp_get_addr(note_type, tsk, idx, &addr); diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index f0f5cd4..f9818d7 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -188,7 +188,7 @@ static int xive_provision_queue(struct kvm_vcpu *vcpu, u8 prio) if (!qpage) { pr_err("Failed to allocate queue %d for VCPU %d\n", prio, xc->server_num); - return -ENOMEM;; + return -ENOMEM; } memset(qpage, 0, 1 << xive->q_order); diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 496e476..a6c92c7 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1854,7 +1854,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask) s64 rc; if (WARN_ON(!pdn || pdn->pe_number == IODA_INVALID_PE)) - return -ENODEV;; + return -ENODEV; pe = &phb->ioda.pe_array[pdn->pe_number]; if (pe->tce_bypass_enabled) { diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 353e20c..886a911 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -439,7 +439,7 @@ setup_uga32(void **uga_handle, unsigned long size, u32 *width, u32 *height) struct efi_uga_draw_protocol *uga = NULL, *first_uga; efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; unsigned long nr_ugas; - u32 *handles = (u32 *)uga_handle;; + u32 *handles = (u32 *)uga_handle; efi_status_t status = EFI_INVALID_PARAMETER; int i; @@ -484,7 +484,7 @@ setup_uga64(void **uga_handle, unsigned long size, u32 *width, u32 *height) struct efi_uga_draw_protocol *uga = NULL, *first_uga; efi_guid_t uga_proto = EFI_UGA_PROTOCOL_GUID; unsigned long nr_ugas; - u64 *handles = (u64 *)uga_handle;; + u64 *handles = (u64 *)uga_handle; efi_status_t status = EFI_INVALID_PARAMETER; int i; diff --git a/block/sed-opal.c b/block/sed-opal.c index 9ed51d0c..e4929ee 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -490,7 +490,7 @@ static int opal_discovery0_end(struct opal_dev *dev) if (!found_com_id) { pr_debug("Could not find OPAL comid for device. Returning early\n"); - return -EOPNOTSUPP;; + return -EOPNOTSUPP; } dev->comid = comid; diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c index a04808a..65e18c8 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -205,12 +205,12 @@ static int __init gic_clocksource_of_init(struct device_node *node) } else if (of_property_read_u32(node, "clock-frequency", &gic_frequency)) { pr_err("GIC frequency not specified.\n"); - return -EINVAL;; + return -EINVAL; } gic_timer_irq = irq_of
Re: [PATCH 16/18] crypto: talitos - do hw_context DMA mapping outside the requests
Le 07/02/2018 à 15:39, Horia Geantă a écrit : On 10/6/2017 4:06 PM, Christophe Leroy wrote: At every request, we map and unmap the same hash hw_context. This patch moves the dma mapping/unmapping in functions ahash_init() and ahash_import(). Signed-off-by: Christophe Leroy --- drivers/crypto/talitos.c | 80 ++-- 1 file changed, 57 insertions(+), 23 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index ebfd6d982ed6..d495649d5267 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -819,6 +819,7 @@ struct talitos_ctx { unsigned int keylen; unsigned int enckeylen; unsigned int authkeylen; + dma_addr_t dma_hw_context; This doesn't look correct. talitos_ctx structure is the tfm context. dma_hw_context is the IOVA of hw_context, located in talitos_ahash_req_ctx structure (request context). Yes but I have now found how I can know that the request context is being released in order to unmap() dma at that time. It is tricky to use the tmf context I agree, but at least I know when tmf context get destroyed, ie in talitos_cra_exit_ahash() The request context is created by ahash_request_alloc() and released by ahash_request_free(). I have not found the way to call dma_unmap() before ahash_request_free() gets called. If there are multiple requests in flight for the same tfm, dma_hw_context will be overwritten. Before overwritting dma_hw_context, it is always released, see talitos_cra_exit_ahash(), ahash_init(), ahash_import() dma_hw_context needs to be moved in request context (talitos_ahash_req_ctx struct). Any suggestion then on how to handle the issue explained above ? Thanks Christophe Thanks, Horia
Re: [GIT PULL 00/41] perf/core improvements and fixes
* Arnaldo Carvalho de Melo wrote: > Hi Ingo, > > Please consider pulling, this is on top of tip/perf/urgent. > > - Arnaldo > > Test results at the end of this message, as usual. > > The following changes since commit 297f9233b53a08fd457815e19f1d6f2c3389857b: > > kprobes: Propagate error from disarm_kprobe_ftrace() (2018-02-16 09:12:58 > +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git > tags/perf-core-for-mingo-4.17-20180216 > > for you to fetch changes up to 21316ac6803d4a1aadd74b896db8d60a92cd1140: > > perf tests shell lib: Use a wildcard to remove the vfs_getname probe > (2018-02-16 15:31:12 -0300) > > > perf/core improvements and fixes: > > - Fix wrong jump arrow in systems with branch records with cycles, > i.e. Intel's >= Skylake (Jin Yao) > > - Fix 'perf record --per-thread' problem introduced when > implementing 'perf stat --per-thread (Jin Yao) > > - Use arch__compare_symbol_names() to fix 'perf test vmlinux', > that was using strcmp(symbol names) while the dso routines > doing symbol lookups used the arch overridable one, making > this test fail in architectures that overrided that function > with something other than strcmp() (Jiri Olsa) > > - Add 'perf script --show-round-event' to display > PERF_RECORD_FINISHED_ROUND entries (Jiri Olsa) > > - Fix dwarf unwind for stripped binaries in 'perf test' (Jiri Olsa) > > - Use ordered_events for 'perf report --tasks', otherwise we may get > artifacts when PERF_RECORD_FORK gets processed before PERF_RECORD_COMM > (when they got recorded in different CPUs) (Jiri Olsa) > > - Add support to display group output for non group events, i.e. > now when one uses 'perf report --group' on a perf.data file > recorded without explicitly grouping events with {} (e.g. > "perf record -e '{cycles,instructions}'" get the same output > that would produce, i.e. see all those non-grouped events in > multiple columns, at the same time (Jiri Olsa) > > - Skip non-address kallsyms entries, e.g. '(null)' for !root (Jiri Olsa) > > - Kernel maps fixes wrt perf.data(report) versus live system (top) > (Jiri Olsa) > > - Fix memory corruption when using 'perf record -j call -g -a ' > followed by 'perf report --branch-history' (Jiri Olsa) > > - ARM CoreSight fixes (Mathieu Poirier) > > - Add inject capability for CoreSight Traces (Robert Waker) > > - Update documentation for use of 'perf' + ARM CoreSight (Robert Walker) > > - Man pages fixes (Sangwon Hong, Jaecheol Shin) > > - Fix some 'perf test' cases on s/390 and x86_64 (some backtraces > changed with a glibc update) (Thomas Richter) > > - Add detailed CPUID info in the 'perf.data' headers for s/390 to > then use it in 'perf annotate' (Thomas Richter) > > - Add '--interval-count N' to 'perf stat', to use with -I, i.e. > 'perf stat -I 1000 --interval-count 2' will show stats every >1000ms, two times (yuzhoujian) > > - Add 'perf stat --timeout Nms', that will run for that many > milliseconds and then stop, printing the counters (yuzhoujian) > > - Fix description for 'perf report --mem-modex (Andi Kleen) > > - Use a wildcard to remove the vfs_getname probe in the > 'perf test' shell based test cases (Arnaldo Carvalho de Melo) > > Signed-off-by: Arnaldo Carvalho de Melo > > > Andi Kleen (1): > perf report: Fix description for --mem-mode > > Arnaldo Carvalho de Melo (1): > perf tests shell lib: Use a wildcard to remove the vfs_getname probe > > Jaecheol Shin (1): > perf annotate: Add missing arguments in Man page > > Jin Yao (2): > perf tools: Use target->per_thread and target->system_wide flags > perf report: Fix wrong jump arrow > > Jiri Olsa (18): > perf record: Put new line after target override warning > perf script: Add --show-round-event to display > PERF_RECORD_FINISHED_ROUND > tools lib api fs: Add filename__read_xll function > tools lib api fs: Add sysfs__read_xll function > perf tests: Fix dwarf unwind for stripped binaries > perf tools: Fix comment for sort__* compare functions > perf report: Ask for ordered events for --tasks option > perf report: Add support to display group output for non group events > tools lib symbol: Skip non-address kallsyms line > perf symbols: Check if we read regular file in dso__load() > perf machine: Free root_dir in machine__init() error path > perf machine: Move kernel mmap name into struct machine > perf machine: Generalize machine__set_kernel_mmap() > perf machine: Don't search for active kernel start in > __machine__create_kernel_maps > perf machine: Remove machine__load_kallsyms() > perf tools: Do not create kernel maps in sample__resolve() > perf tests: Use arch__co
[GIT PULL] Please pull powerpc/linux.git powerpc-4.16-3 tag
Hi Linus, Please pull some more powerpc fixes for 4.16. Sorry to send a pull request on the weekend, and a 2nd one this week, but one of these commits fixes a boot crash which would be good to get in before rc2. cheers The following changes since commit 694a20dae6efc3803740971fa9f7c86b8c8d4685: Merge tag 'powerpc-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (2018-02-14 10:06:41 -0800) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git tags/powerpc-4.16-3 for you to fetch changes up to 2c10636a0b9c689450e85f9945583920f50337c9: powerpc/pseries: Check for zero filled ibm,dynamic-memory property (2018-02-16 21:34:14 +1100) powerpc fixes for 4.16 #3 The main attraction is a fix for a bug in the new drmem code, which was causing an oops on boot on some versions of Qemu. There's also a fix for XIVE (Power9 interrupt controller) on KVM, as well as a few other minor fixes. Thanks to: Corentin Labbe, Cyril Bur, Cédric Le Goater, Daniel Black, Nathan Fontenot, Nicholas Piggin. Corentin Labbe (1): powerpc/pseries: Add empty update_numa_cpu_lookup_table() for NUMA=n Cyril Bur (1): powerpc: Expose TSCR via sysfs only on powernv Cédric Le Goater (1): powerpc/xive: Use hw CPU ids when configuring the CPU queues Nathan Fontenot (1): powerpc/pseries: Check for zero filled ibm,dynamic-memory property Nicholas Piggin (1): powerpc/powernv: IMC fix out of bounds memory access at shutdown arch/powerpc/include/asm/topology.h | 3 +++ arch/powerpc/kernel/sysfs.c | 6 -- arch/powerpc/mm/drmem.c | 8 arch/powerpc/platforms/powernv/opal-imc.c | 6 -- arch/powerpc/sysdev/xive/spapr.c | 16 ++-- 5 files changed, 29 insertions(+), 10 deletions(-) signature.asc Description: PGP signature