diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:20:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:20:57 +0100 |
| commit | ee9dcf22a075bce42d85b58108ca601ca434e663 (patch) | |
| tree | 3d45f9e2fe020d467fbca570d9c4d481afa190ac /p04 | |
| parent | 40c493e29885df8b9e3eaef8418af97ce8a90967 (diff) | |
| download | patches-ee9dcf22a075bce42d85b58108ca601ca434e663.tar.gz | |
update patches based on what is merged in Linus's tree
Diffstat (limited to 'p04')
| -rw-r--r-- | p04 | 77 |
1 files changed, 11 insertions, 66 deletions
@@ -17,9 +17,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 +-- arch/powerpc/kvm/book3s_hv.c | 9 +----- arch/powerpc/kvm/timing.c | 11 +------- - arch/powerpc/mm/dump_hashpagetable.c | 7 +---- - arch/powerpc/mm/dump_linuxpagetables.c | 8 ++--- - arch/powerpc/mm/hash_utils_64.c | 7 +---- arch/powerpc/platforms/4xx/ocm.c | 14 +--------- arch/powerpc/platforms/cell/axon_msi.c | 6 ---- arch/powerpc/platforms/powernv/memtrace.c | 7 ----- @@ -29,11 +26,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> arch/powerpc/platforms/pseries/dtl.c | 36 +++----------------------- arch/powerpc/platforms/pseries/hvCall_inst.c | 12 ++------ arch/powerpc/sysdev/scom.c | 8 ----- - 20 files changed, 45 insertions(+), 202 deletions(-) + 17 files changed, 38 insertions(+), 187 deletions(-) --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h -@@ -293,8 +293,6 @@ struct kvm_arch { +@@ -295,8 +295,6 @@ struct kvm_arch { pgd_t *pgtable; u64 process_table; struct dentry *debugfs_dir; @@ -42,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> struct kvm_resize_hpt *resize_hpt; /* protected by kvm->lock */ #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */ #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE -@@ -806,7 +804,6 @@ struct kvm_vcpu_arch { +@@ -809,7 +807,6 @@ struct kvm_vcpu_arch { struct kvmhv_tb_accumulator cede_time; /* time napping inside guest */ struct dentry *debugfs_dir; @@ -77,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> rc = sysfs_create_file(kernel_kobj, &fadump_release_attr.attr); --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c -@@ -776,8 +776,7 @@ EXPORT_SYMBOL(powerpc_debugfs_root); +@@ -779,8 +779,7 @@ EXPORT_SYMBOL(powerpc_debugfs_root); static int powerpc_debugfs_init(void) { powerpc_debugfs_root = debugfs_create_dir("powerpc", NULL); @@ -89,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #endif --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c -@@ -2173,35 +2173,20 @@ void ppc_warn_emulated_print(const char +@@ -2257,35 +2257,20 @@ void ppc_warn_emulated_print(const char static int __init ppc_warn_emulated_init(void) { @@ -133,7 +130,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> device_initcall(ppc_warn_emulated_init); --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c -@@ -2142,9 +2142,8 @@ static const struct file_operations debu +@@ -2160,9 +2160,8 @@ static const struct file_operations debu void kvmppc_mmu_debugfs_init(struct kvm *kvm) { @@ -147,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> void kvmppc_mmu_book3s_hv_init(struct kvm_vcpu *vcpu) --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c -@@ -1348,9 +1348,8 @@ static const struct file_operations debu +@@ -1361,9 +1361,8 @@ static const struct file_operations debu void kvmhv_radix_debugfs_init(struct kvm *kvm) { @@ -161,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> int kvmppc_radix_init(void) --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c -@@ -2144,14 +2144,9 @@ static void debugfs_vcpu_init(struct kvm +@@ -2160,14 +2160,9 @@ static void debugfs_vcpu_init(struct kvm struct kvm *kvm = vcpu->kvm; snprintf(buf, sizeof(buf), "vcpu%u", id); @@ -202,58 +199,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> vcpu->arch.debugfs_exit_timing = debugfs_file; } ---- a/arch/powerpc/mm/dump_hashpagetable.c -+++ b/arch/powerpc/mm/dump_hashpagetable.c -@@ -537,13 +537,10 @@ static const struct file_operations ptdu - - static int ptdump_init(void) - { -- struct dentry *debugfs_file; -- - if (!radix_enabled()) { - populate_markers(); -- debugfs_file = debugfs_create_file("kernel_hash_pagetable", -- 0400, NULL, NULL, &ptdump_fops); -- return debugfs_file ? 0 : -ENOMEM; -+ debugfs_create_file("kernel_hash_pagetable", 0400, NULL, NULL, -+ &ptdump_fops); - } - return 0; - } ---- a/arch/powerpc/mm/dump_linuxpagetables.c -+++ b/arch/powerpc/mm/dump_linuxpagetables.c -@@ -362,12 +362,10 @@ static void build_pgtable_complete_mask( - - static int ptdump_init(void) - { -- struct dentry *debugfs_file; -- - populate_markers(); - build_pgtable_complete_mask(); -- debugfs_file = debugfs_create_file("kernel_page_tables", 0400, NULL, -- NULL, &ptdump_fops); -- return debugfs_file ? 0 : -ENOMEM; -+ debugfs_create_file("kernel_page_tables", 0400, NULL, NULL, -+ &ptdump_fops); -+ return 0; - } - device_initcall(ptdump_init); ---- a/arch/powerpc/mm/hash_utils_64.c -+++ b/arch/powerpc/mm/hash_utils_64.c -@@ -1893,11 +1893,8 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_hpt_order, - - static int __init hash64_debugfs(void) - { -- if (!debugfs_create_file("hpt_order", 0600, powerpc_debugfs_root, -- NULL, &fops_hpt_order)) { -- pr_err("lpar: unable to create hpt_order debugsfs file\n"); -- } -- -+ debugfs_create_file("hpt_order", 0600, powerpc_debugfs_root, NULL, -+ &fops_hpt_order); - return 0; - } - machine_device_initcall(pseries, hash64_debugfs); --- a/arch/powerpc/platforms/4xx/ocm.c +++ b/arch/powerpc/platforms/4xx/ocm.c @@ -280,22 +280,12 @@ static const struct file_operations ocm_ @@ -297,7 +242,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #endif /* DEBUG */ --- a/arch/powerpc/platforms/powernv/memtrace.c +++ b/arch/powerpc/platforms/powernv/memtrace.c -@@ -190,11 +190,6 @@ static int memtrace_init_debugfs(void) +@@ -191,11 +191,6 @@ static int memtrace_init_debugfs(void) snprintf(ent->name, 16, "%08x", ent->nid); dir = debugfs_create_dir(ent->name, memtrace_debugfs_dir); @@ -309,7 +254,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ent->dir = dir; debugfs_create_file("trace", 0400, dir, ent, &memtrace_fops); -@@ -318,8 +313,6 @@ static int memtrace_init(void) +@@ -319,8 +314,6 @@ static int memtrace_init(void) { memtrace_debugfs_dir = debugfs_create_dir("memtrace", powerpc_debugfs_root); @@ -377,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c -@@ -3168,11 +3168,6 @@ static void pnv_pci_ioda_create_dbgfs(vo +@@ -3107,11 +3107,6 @@ static void pnv_pci_ioda_create_dbgfs(vo sprintf(name, "PCI%04x", hose->global_number); phb->dbgfs = debugfs_create_dir(name, powerpc_debugfs_root); |