Patchwork [v2,5/6] target-ppc: make some functions static

login
register
mail settings
Submitter Blue Swirl
Date Oct. 28, 2012, 11:04 a.m.
Message ID <5d8cc784f28d55335457ca6dae1add0040bd4e17.1351422116.git.blauwirbel@gmail.com>
Download mbox | patch
Permalink /patch/194692/
State New
Headers show

Comments

Blue Swirl - Oct. 28, 2012, 11:04 a.m.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 target-ppc/cpu.h        |    6 ------
 target-ppc/mmu_helper.c |   11 ++++++-----
 2 files changed, 6 insertions(+), 11 deletions(-)
Alexander Graf - Oct. 29, 2012, 7:08 p.m.
On 28.10.2012, at 12:04, Blue Swirl wrote:

> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

Acked-by: Alexander Graf <agraf@suse.de>

Alex

> ---
> target-ppc/cpu.h        |    6 ------
> target-ppc/mmu_helper.c |   11 ++++++-----
> 2 files changed, 6 insertions(+), 11 deletions(-)
> 
> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
> index b34a1ff..a5e7c55 100644
> --- a/target-ppc/cpu.h
> +++ b/target-ppc/cpu.h
> @@ -1141,10 +1141,6 @@ int cpu_ppc_signal_handler (int host_signum, void *pinfo,
> int cpu_ppc_handle_mmu_fault (CPUPPCState *env, target_ulong address, int rw,
>                               int mmu_idx);
> #define cpu_handle_mmu_fault cpu_ppc_handle_mmu_fault
> -#if !defined(CONFIG_USER_ONLY)
> -int get_physical_address (CPUPPCState *env, mmu_ctx_t *ctx, target_ulong vaddr,
> -                          int rw, int access_type);
> -#endif
> void do_interrupt (CPUPPCState *env);
> void ppc_hw_interrupt (CPUPPCState *env);
> 
> @@ -1189,8 +1185,6 @@ void store_40x_dbcr0 (CPUPPCState *env, uint32_t val);
> void store_40x_sler (CPUPPCState *env, uint32_t val);
> void store_booke_tcr (CPUPPCState *env, target_ulong val);
> void store_booke_tsr (CPUPPCState *env, target_ulong val);
> -void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot);
> -hwaddr booke206_tlb_to_page_size(CPUPPCState *env, ppcmas_tlb_t *tlb);
> int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb,
>                      hwaddr *raddrp, target_ulong address,
>                      uint32_t pid);
> diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
> index 4a9bb5b..31aa5c9 100644
> --- a/target-ppc/mmu_helper.c
> +++ b/target-ppc/mmu_helper.c
> @@ -1276,7 +1276,8 @@ static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
>     return ret;
> }
> 
> -void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot)
> +static void booke206_flush_tlb(CPUPPCState *env, int flags,
> +                               const int check_iprot)
> {
>     int tlb_size;
>     int i, j;
> @@ -1297,8 +1298,8 @@ void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot)
>     tlb_flush(env, 1);
> }
> 
> -hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
> -                                             ppcmas_tlb_t *tlb)
> +static hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
> +                                        ppcmas_tlb_t *tlb)
> {
>     int tlbm_size;
> 
> @@ -1708,8 +1709,8 @@ static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,
>     return ret;
> }
> 
> -int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr,
> -                         int rw, int access_type)
> +static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
> +                                target_ulong eaddr, int rw, int access_type)
> {
>     int ret;
> 
> -- 
> 1.7.2.5
>

Patch

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index b34a1ff..a5e7c55 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1141,10 +1141,6 @@  int cpu_ppc_signal_handler (int host_signum, void *pinfo,
 int cpu_ppc_handle_mmu_fault (CPUPPCState *env, target_ulong address, int rw,
                               int mmu_idx);
 #define cpu_handle_mmu_fault cpu_ppc_handle_mmu_fault
-#if !defined(CONFIG_USER_ONLY)
-int get_physical_address (CPUPPCState *env, mmu_ctx_t *ctx, target_ulong vaddr,
-                          int rw, int access_type);
-#endif
 void do_interrupt (CPUPPCState *env);
 void ppc_hw_interrupt (CPUPPCState *env);
 
@@ -1189,8 +1185,6 @@  void store_40x_dbcr0 (CPUPPCState *env, uint32_t val);
 void store_40x_sler (CPUPPCState *env, uint32_t val);
 void store_booke_tcr (CPUPPCState *env, target_ulong val);
 void store_booke_tsr (CPUPPCState *env, target_ulong val);
-void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot);
-hwaddr booke206_tlb_to_page_size(CPUPPCState *env, ppcmas_tlb_t *tlb);
 int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb,
                      hwaddr *raddrp, target_ulong address,
                      uint32_t pid);
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 4a9bb5b..31aa5c9 100644
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -1276,7 +1276,8 @@  static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
     return ret;
 }
 
-void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot)
+static void booke206_flush_tlb(CPUPPCState *env, int flags,
+                               const int check_iprot)
 {
     int tlb_size;
     int i, j;
@@ -1297,8 +1298,8 @@  void booke206_flush_tlb(CPUPPCState *env, int flags, const int check_iprot)
     tlb_flush(env, 1);
 }
 
-hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
-                                             ppcmas_tlb_t *tlb)
+static hwaddr booke206_tlb_to_page_size(CPUPPCState *env,
+                                        ppcmas_tlb_t *tlb)
 {
     int tlbm_size;
 
@@ -1708,8 +1709,8 @@  static inline int check_physical(CPUPPCState *env, mmu_ctx_t *ctx,
     return ret;
 }
 
-int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr,
-                         int rw, int access_type)
+static int get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
+                                target_ulong eaddr, int rw, int access_type)
 {
     int ret;