From: Roger Quadros <ext-roger.quadros@nokia.com>
To: ext Roger Quadros <ext-roger.quadros@nokia.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>, linux-omap@vger.kernel.org
Subject: Re: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
Date: Tue, 07 Apr 2009 14:18:51 +0300 [thread overview]
Message-ID: <49DB369B.3070509@nokia.com> (raw)
In-Reply-To: <49DB1560.4050609@nokia.com>
The patch fixes the following link errors
arch/arm/mach-omap2/built-in.o: In function `omap3_round_to_table_rate':
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:956:
undefined reference to `mpu_opps'
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:956:
undefined reference to `dsp_opps'
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:956:
undefined reference to `l3_opps'
arch/arm/mach-omap2/built-in.o: In function `omap2_clk_init_cpufreq_table':
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:719:
undefined reference to `mpu_opps'
arch/arm/mach-omap2/built-in.o: In function `omap3_select_table_rate':
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:1020:
undefined reference to `mpu_opps'
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:1020:
undefined reference to `dsp_opps'
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:1020:
undefined reference to `l3_opps'
arch/arm/mach-omap2/built-in.o: In function `omap2_init_common_hw':
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/io.c:241: undefined
reference to `omap_pm_if_early_init'
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/io.c:246: undefined
reference to `omap_pm_if_init'
arch/arm/mach-omap2/built-in.o: In function `omap2_clk_init':
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:887:
undefined reference to `mpu_opps'
/home/roger/maemo/linux/linux-roverx/arch/arm/mach-omap2/clock34xx.c:887:
undefined reference to `l3_opps'
make: *** [.tmp_vmlinux1] Error 1
ext Roger Quadros wrote:
> From: Roger Quadros <ext-roger.quadros@nokia.com>
> Date: Tue, 7 Apr 2009 11:10:29 +0300
> Subject: [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set
>
> Removes undefined symbol link errors. Required symbols are defined in
> common.c and omap-pm.h
>
> Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com>
> ---
> arch/arm/plat-omap/common.c | 6 ++++++
> arch/arm/plat-omap/include/mach/omap-pm.h | 15 +++++++++++++++
> 2 files changed, 21 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
> index 2866612..634ca39 100644
> --- a/arch/arm/plat-omap/common.c
> +++ b/arch/arm/plat-omap/common.c
> @@ -46,6 +46,12 @@ int omap_bootloader_tag_len;
> struct omap_board_config_kernel *omap_board_config;
> int omap_board_config_size;
>
> +#ifdef CONFIG_OMAP_PM_NONE
> +struct omap_opp *mpu_opps;
> +struct omap_opp *dsp_opps;
> +struct omap_opp *l3_opps;
> +#endif
> +
> #ifdef CONFIG_OMAP_BOOT_TAG
>
> static int __init parse_tag_omap(const struct tag *tag)
> diff --git a/arch/arm/plat-omap/include/mach/omap-pm.h
> b/arch/arm/plat-omap/include/mach/omap-pm.h
> index f0bbd36..6a8499a 100644
> --- a/arch/arm/plat-omap/include/mach/omap-pm.h
> +++ b/arch/arm/plat-omap/include/mach/omap-pm.h
> @@ -58,9 +58,20 @@ extern struct omap_opp *l3_opps;
> * framework starts. The "_if_" is to avoid name collisions with the
> * PM idle-loop code.
> */
> +#ifdef CONFIG_OMAP_PM_NONE
> +static inline int __init omap_pm_if_early_init(struct omap_opp
> *mpu_opp_table,
> + struct omap_opp *dsp_opp_table,
> + struct omap_opp *l3_opp_table) {
> + mpu_opps = 0;
> + dsp_opps = 0;
> + l3_opps = 0;
> + return 0;
> +}
> +#else
> int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,
> struct omap_opp *dsp_opp_table,
> struct omap_opp *l3_opp_table);
> +#endif
>
> /**
> * omap_pm_if_init - OMAP PM init code called after clock fw init
> @@ -68,7 +79,11 @@ int __init omap_pm_if_early_init(struct omap_opp
> *mpu_opp_table,
> * The main initialization code. OPP tables are passed in here. The
> * "_if_" is to avoid name collisions with the PM idle-loop code.
> */
> +#ifdef CONFIG_OMAP_PM_NONE
> +static inline int __init omap_pm_if_init(void) { return 0; }
> +#else
> int __init omap_pm_if_init(void);
> +#endif
>
> /**
> * omap_pm_if_exit - OMAP PM exit code
next prev parent reply other threads:[~2009-04-07 11:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 8:57 [PATCH] PM: OMAP: Fix build with CONFIG_OMAP_PM_NONE set Roger Quadros
2009-04-07 11:18 ` Roger Quadros [this message]
2009-04-07 15:01 ` Premi, Sanjeev
2009-04-08 6:57 ` Roger Quadros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49DB369B.3070509@nokia.com \
--to=ext-roger.quadros@nokia.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.