| Submitter | Yang Shi |
|---|---|
| Date | 2010-03-03 08:03:20 |
| Message ID | <50e36e8549769a26986f99a23772d23fd039c230.1267604875.git.yang.shi@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/1022/ |
| State | Accepted |
| Delegated to: | Ralf Baechle |
| Headers | show |
Comments
On 03/03/2010 12:43 AM, Yang Shi wrote: > In Octeon's setup.c, octeon_reserve32_memory is defined, so remove the > redundant extern declaration of this variable. > > Signed-off-by: Yang Shi<yang.shi@windriver.com> Acked-by: David Daney <ddaney@caviumnetworks.com> This looks good to me. Thanks, David Daney > --- > arch/mips/cavium-octeon/setup.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c > index 4eaa35f..8309d68 100644 > --- a/arch/mips/cavium-octeon/setup.c > +++ b/arch/mips/cavium-octeon/setup.c > @@ -45,9 +45,6 @@ extern struct plat_smp_ops octeon_smp_ops; > extern void pci_console_init(const char *arg); > #endif > > -#ifdef CONFIG_CAVIUM_RESERVE32 > -extern uint64_t octeon_reserve32_memory; > -#endif > static unsigned long long MAX_MEMORY = 512ull<< 20; > > struct octeon_boot_descriptor *octeon_boot_desc_ptr;
On Wed, Mar 03, 2010 at 10:25:49AM -0800, David Daney wrote: > On 03/03/2010 12:43 AM, Yang Shi wrote: > >In Octeon's setup.c, octeon_reserve32_memory is defined, so remove the > >redundant extern declaration of this variable. > > > >Signed-off-by: Yang Shi<yang.shi@windriver.com> > > Acked-by: David Daney <ddaney@caviumnetworks.com> > > This looks good to me. Thanks, > David Daney Applied, thanks. Ralf
Patch
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 4eaa35f..8309d68 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -45,9 +45,6 @@ extern struct plat_smp_ops octeon_smp_ops; extern void pci_console_init(const char *arg); #endif -#ifdef CONFIG_CAVIUM_RESERVE32 -extern uint64_t octeon_reserve32_memory; -#endif static unsigned long long MAX_MEMORY = 512ull << 20; struct octeon_boot_descriptor *octeon_boot_desc_ptr;
In Octeon's setup.c, octeon_reserve32_memory is defined, so remove the redundant extern declaration of this variable. Signed-off-by: Yang Shi <yang.shi@windriver.com> --- arch/mips/cavium-octeon/setup.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)