Commit 2b461880 authored by Michael Ellerman's avatar Michael Ellerman

powerpc: Fix all occurences of duplicate words

Since commit 87c78b61 ("powerpc: Fix all occurences of "the the"")
fixed "the the", there's now a steady stream of patches fixing other
duplicate words.

Just fix them all at once, to save the overhead of dealing with
individual patches for each case.

This leaves a few cases of "that that", which in some contexts is
correct.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220718095158.326606-1-mpe@ellerman.id.au
parent e7c45a08
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* instructions per clock cycle using one 32/64 bit unit (SU1) and one 32 * instructions per clock cycle using one 32/64 bit unit (SU1) and one 32
* bit unit (SU2). One of these can be a memory access that is executed via * bit unit (SU2). One of these can be a memory access that is executed via
* a single load and store unit (LSU). XTS-AES-256 takes ~780 operations per * a single load and store unit (LSU). XTS-AES-256 takes ~780 operations per
* 16 byte block block or 25 cycles per byte. Thus 768 bytes of input data * 16 byte block or 25 cycles per byte. Thus 768 bytes of input data
* will need an estimated maximum of 20,000 cycles. Headroom for cache misses * will need an estimated maximum of 20,000 cycles. Headroom for cache misses
* included. Even with the low end model clocked at 667 MHz this equals to a * included. Even with the low end model clocked at 667 MHz this equals to a
* critical time window of less than 30us. The value has been chosen to * critical time window of less than 30us. The value has been chosen to
......
...@@ -73,7 +73,7 @@ static inline void rmci_maybe_off(void) ...@@ -73,7 +73,7 @@ static inline void rmci_maybe_off(void)
* the display during identify_machine() and MMU_Init() * the display during identify_machine() and MMU_Init()
* *
* The display is mapped to virtual address 0xD0000000, rather * The display is mapped to virtual address 0xD0000000, rather
* than 1:1, because some some CHRP machines put the frame buffer * than 1:1, because some CHRP machines put the frame buffer
* in the region starting at 0xC0000000 (PAGE_OFFSET). * in the region starting at 0xC0000000 (PAGE_OFFSET).
* This mapping is temporary and will disappear as soon as the * This mapping is temporary and will disappear as soon as the
* setup done by MMU_Init() is applied. * setup done by MMU_Init() is applied.
......
...@@ -750,7 +750,7 @@ static void eeh_pe_cleanup(struct eeh_pe *pe) ...@@ -750,7 +750,7 @@ static void eeh_pe_cleanup(struct eeh_pe *pe)
* @pdev: pci_dev to check * @pdev: pci_dev to check
* *
* This function may return a false positive if we can't determine the slot's * This function may return a false positive if we can't determine the slot's
* presence state. This might happen for for PCIe slots if the PE containing * presence state. This might happen for PCIe slots if the PE containing
* the upstream bridge is also frozen, or the bridge is part of the same PE * the upstream bridge is also frozen, or the bridge is part of the same PE
* as the device. * as the device.
* *
......
...@@ -2779,7 +2779,7 @@ EXC_COMMON_BEGIN(soft_nmi_common) ...@@ -2779,7 +2779,7 @@ EXC_COMMON_BEGIN(soft_nmi_common)
/* /*
* An interrupt came in while soft-disabled. We set paca->irq_happened, then: * An interrupt came in while soft-disabled. We set paca->irq_happened, then:
* - If it was a decrementer interrupt, we bump the dec to max and and return. * - If it was a decrementer interrupt, we bump the dec to max and return.
* - If it was a doorbell we return immediately since doorbells are edge * - If it was a doorbell we return immediately since doorbells are edge
* triggered and won't automatically refire. * triggered and won't automatically refire.
* - If it was a HMI we return immediately since we handled it in realmode * - If it was a HMI we return immediately since we handled it in realmode
......
...@@ -1088,7 +1088,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) ...@@ -1088,7 +1088,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
*/ */
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);
/* Now fixup the bus bus */ /* Now fixup the bus */
pcibios_setup_bus_self(bus); pcibios_setup_bus_self(bus);
} }
EXPORT_SYMBOL(pcibios_fixup_bus); EXPORT_SYMBOL(pcibios_fixup_bus);
......
...@@ -259,7 +259,7 @@ void remove_sriov_vf_pdns(struct pci_dev *pdev) ...@@ -259,7 +259,7 @@ void remove_sriov_vf_pdns(struct pci_dev *pdev)
if (edev) { if (edev) {
/* /*
* We allocate pci_dn's for the totalvfs count, * We allocate pci_dn's for the totalvfs count,
* but only only the vfs that were activated * but only the vfs that were activated
* have a configured PE. * have a configured PE.
*/ */
if (edev->pe) if (edev->pe)
......
...@@ -71,7 +71,7 @@ int fpr_set(struct task_struct *target, const struct user_regset *regset, ...@@ -71,7 +71,7 @@ int fpr_set(struct task_struct *target, const struct user_regset *regset,
} }
/* /*
* Currently to set and and get all the vsx state, you need to call * Currently to set and get all the vsx state, you need to call
* the fp and VMX calls as well. This only get/sets the lower 32 * the fp and VMX calls as well. This only get/sets the lower 32
* 128bit VSX registers. * 128bit VSX registers.
*/ */
......
...@@ -125,7 +125,7 @@ __ftrace_make_nop(struct module *mod, ...@@ -125,7 +125,7 @@ __ftrace_make_nop(struct module *mod,
return -EFAULT; return -EFAULT;
} }
/* Make sure that that this is still a 24bit jump */ /* Make sure that this is still a 24bit jump */
if (!is_bl_op(op)) { if (!is_bl_op(op)) {
pr_err("Not expected bl: opcode is %08lx\n", ppc_inst_as_ulong(op)); pr_err("Not expected bl: opcode is %08lx\n", ppc_inst_as_ulong(op));
return -EINVAL; return -EINVAL;
...@@ -311,7 +311,7 @@ static int __ftrace_make_nop_kernel(struct dyn_ftrace *rec, unsigned long addr) ...@@ -311,7 +311,7 @@ static int __ftrace_make_nop_kernel(struct dyn_ftrace *rec, unsigned long addr)
return -EFAULT; return -EFAULT;
} }
/* Make sure that that this is still a 24bit jump */ /* Make sure that this is still a 24bit jump */
if (!is_bl_op(op)) { if (!is_bl_op(op)) {
pr_err("Not expected bl: opcode is %08lx\n", ppc_inst_as_ulong(op)); pr_err("Not expected bl: opcode is %08lx\n", ppc_inst_as_ulong(op));
return -EINVAL; return -EINVAL;
...@@ -564,7 +564,7 @@ __ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr, ...@@ -564,7 +564,7 @@ __ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
return -EFAULT; return -EFAULT;
} }
/* Make sure that that this is still a 24bit jump */ /* Make sure that this is still a 24bit jump */
if (!is_bl_op(op)) { if (!is_bl_op(op)) {
pr_err("Not expected bl: opcode is %08lx\n", ppc_inst_as_ulong(op)); pr_err("Not expected bl: opcode is %08lx\n", ppc_inst_as_ulong(op));
return -EINVAL; return -EINVAL;
......
...@@ -353,7 +353,7 @@ static void watchdog_timer_interrupt(int cpu) ...@@ -353,7 +353,7 @@ static void watchdog_timer_interrupt(int cpu)
if (__wd_nmi_output && xchg(&__wd_nmi_output, 0)) { if (__wd_nmi_output && xchg(&__wd_nmi_output, 0)) {
/* /*
* Something has called printk from NMI context. It might be * Something has called printk from NMI context. It might be
* stuck, so this this triggers a flush that will get that * stuck, so this triggers a flush that will get that
* printk output to the console. * printk output to the console.
* *
* See wd_lockup_ipi. * See wd_lockup_ipi.
......
...@@ -5665,7 +5665,7 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi) ...@@ -5665,7 +5665,7 @@ static int kvmppc_clr_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
else else
kvmppc_xics_clr_mapped(kvm, guest_gsi, pimap->mapped[i].r_hwirq); kvmppc_xics_clr_mapped(kvm, guest_gsi, pimap->mapped[i].r_hwirq);
/* invalidate the entry (what do do on error from the above ?) */ /* invalidate the entry (what to do on error from the above ?) */
pimap->mapped[i].r_hwirq = 0; pimap->mapped[i].r_hwirq = 0;
/* /*
......
...@@ -408,7 +408,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, ...@@ -408,7 +408,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
ssize); ssize);
if (ret == -1) { if (ret == -1) {
/* /*
* Try to to keep bolted entries in primary. * Try to keep bolted entries in primary.
* Remove non bolted entries and try insert again * Remove non bolted entries and try insert again
*/ */
ret = mmu_hash_ops.hpte_remove(hpteg); ret = mmu_hash_ops.hpte_remove(hpteg);
......
...@@ -63,7 +63,7 @@ static unsigned int cpm_set(unsigned int cpm_reg, unsigned int mask) ...@@ -63,7 +63,7 @@ static unsigned int cpm_set(unsigned int cpm_reg, unsigned int mask)
* known as class 1, 2 and 3. For class 1 units, they are * known as class 1, 2 and 3. For class 1 units, they are
* unconditionally put to sleep when the corresponding CPM bit is * unconditionally put to sleep when the corresponding CPM bit is
* set. For class 2 and 3 units this is not case; if they can be * set. For class 2 and 3 units this is not case; if they can be
* put to to sleep, they will. Here we do not verify, we just * put to sleep, they will. Here we do not verify, we just
* set them and expect them to eventually go off when they can. * set them and expect them to eventually go off when they can.
*/ */
value = dcr_read(cpm.dcr_host, cpm.dcr_offset[cpm_reg]); value = dcr_read(cpm.dcr_host, cpm.dcr_offset[cpm_reg]);
......
...@@ -77,7 +77,7 @@ irqreturn_t vas_fault_thread_fn(int irq, void *data) ...@@ -77,7 +77,7 @@ irqreturn_t vas_fault_thread_fn(int irq, void *data)
/* /*
* VAS can interrupt with multiple page faults. So process all * VAS can interrupt with multiple page faults. So process all
* valid CRBs within fault FIFO until reaches invalid CRB. * valid CRBs within fault FIFO until reaches invalid CRB.
* We use CCW[0] and pswid to validate validate CRBs: * We use CCW[0] and pswid to validate CRBs:
* *
* CCW[0] Reserved bit. When NX pastes CRB, CCW[0]=0 * CCW[0] Reserved bit. When NX pastes CRB, CCW[0]=0
* OS sets this bit to 1 after reading CRB. * OS sets this bit to 1 after reading CRB.
......
...@@ -71,7 +71,7 @@ static void pseries_pcibios_bus_add_device(struct pci_dev *pdev) ...@@ -71,7 +71,7 @@ static void pseries_pcibios_bus_add_device(struct pci_dev *pdev)
if (pdev->is_virtfn) { if (pdev->is_virtfn) {
/* /*
* FIXME: This really should be handled by choosing the right * FIXME: This really should be handled by choosing the right
* parent PE in in pseries_eeh_init_edev(). * parent PE in pseries_eeh_init_edev().
*/ */
struct eeh_pe *physfn_pe = pci_dev_to_eeh_dev(pdev->physfn)->pe; struct eeh_pe *physfn_pe = pci_dev_to_eeh_dev(pdev->physfn)->pe;
struct eeh_dev *edev = pdn_to_eeh_dev(pdn); struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
(1ul << ND_CMD_SET_CONFIG_DATA) | \ (1ul << ND_CMD_SET_CONFIG_DATA) | \
(1ul << ND_CMD_CALL)) (1ul << ND_CMD_CALL))
/* DIMM health bitmap bitmap indicators */ /* DIMM health bitmap indicators */
/* SCM device is unable to persist memory contents */ /* SCM device is unable to persist memory contents */
#define PAPR_PMEM_UNARMED (1ULL << (63 - 0)) #define PAPR_PMEM_UNARMED (1ULL << (63 - 0))
/* SCM device failed to persist memory contents */ /* SCM device failed to persist memory contents */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment