Skip to content

Commit

Permalink
powerpc: address missing-prototypes warnings
Browse files Browse the repository at this point in the history
There are a few warnings in powerpc64 defconfig builds after -Wmissing-prototypes
gets promoted from W=1 to the default warning set:

arch/powerpc/mm/book3s64/pgtable.c:422:6: error: no previous prototype for 'arch_report_meminfo' [-Werror=missing-prototypes]
arch/powerpc/platforms/cell/ras.c:275:5: error: no previous prototype for 'cbe_sysreset_hack' [-Werror=missing-prototypes]
arch/powerpc/platforms/cell/spu_manage.c:29:21: error: no previous prototype for 'spu_devnode' [-Werror=missing-prototypes]
arch/powerpc/platforms/pasemi/time.c:12:17: error: no previous prototype for 'pas_get_boot_time' [-Werror=missing-prototypes]
arch/powerpc/platforms/powermac/feature.c:1532:13: error: no previous prototype for 'g5_phy_disable_cpu1' [-Werror=missing-prototypes]
arch/powerpc/platforms/86xx/pic.c:28:13: error: no previous prototype for 'mpc86xx_init_irq' [-Werror=missing-prototypes]
drivers/pci/pci-sysfs.c:936:13: error: no previous prototype for 'pci_adjust_legacy_attr' [-Werror=missing-prototypes]

Address these by including the right header files or marking the
functions static. The audit.c one is a bit tricky since compat_audit.h
cannot include regular kernel headers tht have conflicting types on
32-bit powerpc.

Signed-off-by: Arnd Bergmann <[email protected]>
[mpe: Drop change to __vmemmap_free() which only exists in mm]
Signed-off-by: Michael Ellerman <[email protected]>
Link: https://msgid.link/[email protected]
  • Loading branch information
arndb authored and mpe committed Jul 28, 2023
1 parent 10c006d commit d6582c2
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 3 deletions.
3 changes: 2 additions & 1 deletion arch/powerpc/include/asm/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ extern int pci_legacy_write(struct pci_bus *bus, loff_t port, u32 val,
extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
struct vm_area_struct *vma,
enum pci_mmap_state mmap_state);

extern void pci_adjust_legacy_attr(struct pci_bus *bus,
enum pci_mmap_state mmap_type);
#define HAVE_PCI_LEGACY 1

extern void pcibios_claim_one_bus(struct pci_bus *b);
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <linux/audit.h>
#include <asm/unistd.h>

#include "audit_32.h"

static unsigned dir_class[] = {
#include <asm-generic/audit_dir_write.h>
~0U
Expand Down Expand Up @@ -41,7 +43,6 @@ int audit_classify_arch(int arch)
int audit_classify_syscall(int abi, unsigned syscall)
{
#ifdef CONFIG_PPC64
extern int ppc32_classify_syscall(unsigned);
if (abi == AUDIT_ARCH_PPC)
return ppc32_classify_syscall(syscall);
#endif
Expand Down
7 changes: 7 additions & 0 deletions arch/powerpc/kernel/audit_32.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#ifndef __AUDIT_32_H__
#define __AUDIT_32_H__

extern int ppc32_classify_syscall(unsigned);

#endif
2 changes: 2 additions & 0 deletions arch/powerpc/kernel/compat_audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <linux/audit_arch.h>
#include <asm/unistd.h>

#include "audit_32.h"

unsigned ppc32_dir_class[] = {
#include <asm-generic/audit_dir_write.h>
~0U
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/mm/book3s64/pgtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <linux/memremap.h>
#include <linux/pkeys.h>
#include <linux/debugfs.h>
#include <linux/proc_fs.h>
#include <misc/cxl-base.h>

#include <asm/pgalloc.h>
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/platforms/86xx/pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include <asm/mpic.h>
#include <asm/i8259.h>

#include "mpc86xx.h"

#ifdef CONFIG_PPC_I8259
static void mpc86xx_8259_cascade(struct irq_desc *desc)
{
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/cell/ras.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <asm/cell-regs.h>

#include "ras.h"

#include "pervasive.h"

static void dump_fir(int cpu)
{
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/cell/spu_manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include "spufs/spufs.h"
#include "interrupt.h"
#include "spu_priv1_mmio.h"

struct device_node *spu_devnode(struct spu *spu)
{
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/pasemi/pasemi.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

extern time64_t pas_get_boot_time(void);
extern void pas_pci_init(void);
struct pci_dev;
extern void pas_pci_irq_fixup(struct pci_dev *dev);
extern void pas_pci_dma_dev_setup(struct pci_dev *dev);

Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/platforms/pasemi/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

#include <asm/time.h>

#include "pasemi.h"

time64_t __init pas_get_boot_time(void)
{
/* Let's just return a fake date right now */
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/platforms/powermac/feature.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include <asm/pci-bridge.h>
#include <asm/pmac_low_i2c.h>

#include "pmac.h"

#undef DEBUG_FEATURE

#ifdef DEBUG_FEATURE
Expand Down

0 comments on commit d6582c2

Please sign in to comment.