Re: linux-next: Tree for Jun 17

[Geert Uytterhoeven]

Hi Stephen,

On Mon, Jun 17, 2013 at 10:51 AM, Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Changes since 20130607:
>
> New trees: arm-mpidr and arm64-hugepages

[long list of new conflicts deleted]

Good to see you're back!
Thanks a lot ;-)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Randy Dunlap]

On 06/17/13 01:51, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20130607:
>


on i386 and x86_64:

when built as loadable module:

ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!

or when built-in:

drivers/built-in.o: In function `pkg_temp_thermal_init':
x86_pkg_temp_thermal.c:(.init.text+0x1492b): undefined reference to `platform_thermal_package_notify'
x86_pkg_temp_thermal.c:(.init.text+0x14936): undefined reference to `platform_thermal_package_rate_control'
x86_pkg_temp_thermal.c:(.init.text+0x150fe): undefined reference to `platform_thermal_package_notify'
x86_pkg_temp_thermal.c:(.init.text+0x15109): undefined reference to `platform_thermal_package_rate_control'
drivers/built-in.o: In function `pkg_temp_thermal_exit':
x86_pkg_temp_thermal.c:(.exit.text+0x3a9b): undefined reference to `platform_thermal_package_notify'
x86_pkg_temp_thermal.c:(.exit.text+0x3aa6): undefined reference to `platform_thermal_package_rate_control'


Full randconfig file is attached (for loadable module build).



--
~Randy

[Randy Dunlap]

On 06/17/13 01:51, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20130607:
>

on x86_64:

fs/built-in.o: In function `elf_core_dump':
compat_binfmt_elf.c:(.text+0x3d83d): undefined reference to `elf_core_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3e256): undefined reference to `elf_core_extra_data_size'
compat_binfmt_elf.c:(.text+0x3e42d): undefined reference to `elf_core_write_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3e61e): undefined reference to `elf_core_write_extra_data'

and

warning: (IA32_EMULATION) selects COMPAT_BINFMT_ELF which has unmet direct dependencies (COMPAT && BINFMT_ELF)


Full randconfig file is attached.


--
~Randy

[Srinivas Pandruvada]

This requires CONFIG_X86_MCE, which is by default is set to "y".

Thanks,
Srinivas

[Randy Dunlap]

On 06/17/13 01:51, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20130607:
>

on x86_64:

CONFIG_VIDEO_V4L2=m
CONFIG_USB_VIDEO_CLASS=y


drivers/built-in.o: In function `vb2_fop_mmap':
(.text+0xb7ec0): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_ioctl_streamoff':
(.text+0xb8639): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_ioctl_streamon':
(.text+0xb87ad): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_ioctl_expbuf':
(.text+0xb89a9): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_ioctl_querybuf':
(.text+0xb8b2d): undefined reference to `video_devdata'
drivers/built-in.o:(.text+0xb9301): more undefined references to `video_devdata' follow
drivers/built-in.o: In function `vb2_fop_release':
(.text+0xb9753): undefined reference to `v4l2_fh_release'
drivers/built-in.o: In function `vb2_ioctl_qbuf':
(.text+0xb9ce8): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_ioctl_prepare_buf':
(.text+0xba091): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_poll':
(.text+0xba206): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_poll':
(.text+0xba238): undefined reference to `v4l2_event_pending'
drivers/built-in.o: In function `vb2_fop_poll':
(.text+0xba436): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_ioctl_dqbuf':
(.text+0xba91c): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_fop_write':
(.text+0xbad04): undefined reference to `video_devdata'
drivers/built-in.o: In function `vb2_fop_read':
(.text+0xbadee): undefined reference to `video_devdata'
drivers/built-in.o: In function `uvc_delete':
uvc_driver.c:(.text+0xbb56d): undefined reference to `v4l2_device_unregister'
uvc_driver.c:(.text+0xbb5b8): undefined reference to `video_device_release'
drivers/built-in.o: In function `uvc_unregister_video':
uvc_driver.c:(.text+0xbb670): undefined reference to `video_unregister_device'
drivers/built-in.o: In function `uvc_probe':
uvc_driver.c:(.text+0xbd0c5): undefined reference to `v4l2_device_register'
uvc_driver.c:(.text+0xbd162): undefined reference to `v4l2_prio_init'
uvc_driver.c:(.text+0xbd68c): undefined reference to `video_device_alloc'
uvc_driver.c:(.text+0xbd72d): undefined reference to `__video_register_device'
uvc_driver.c:(.text+0xbd751): undefined reference to `video_device_release'
drivers/built-in.o: In function `uvc_v4l2_ioctl':
uvc_v4l2.c:(.text+0xbe07e): undefined reference to `v4l_printk_ioctl'
uvc_v4l2.c:(.text+0xbe0a1): undefined reference to `video_usercopy'
drivers/built-in.o: In function `uvc_v4l2_open':
uvc_v4l2.c:(.text+0xbe5f0): undefined reference to `video_devdata'
uvc_v4l2.c:(.text+0xbe6b6): undefined reference to `v4l2_fh_init'
uvc_v4l2.c:(.text+0xbe6be): undefined reference to `v4l2_fh_add'
drivers/built-in.o: In function `uvc_v4l2_release':
uvc_v4l2.c:(.text+0xbe758): undefined reference to `v4l2_fh_del'
uvc_v4l2.c:(.text+0xbe760): undefined reference to `v4l2_fh_exit'
drivers/built-in.o: In function `uvc_v4l2_do_ioctl':
uvc_v4l2.c:(.text+0xbe7db): undefined reference to `video_devdata'
uvc_v4l2.c:(.text+0xbeb4d): undefined reference to `v4l2_prio_max'
uvc_v4l2.c:(.text+0xbeb6b): undefined reference to `v4l2_prio_check'
uvc_v4l2.c:(.text+0xbeb90): undefined reference to `v4l2_prio_change'
uvc_v4l2.c:(.text+0xbec05): undefined reference to `v4l2_prio_check'
uvc_v4l2.c:(.text+0xbed07): undefined reference to `v4l2_prio_check'
uvc_v4l2.c:(.text+0xbef48): undefined reference to `v4l2_prio_check'
uvc_v4l2.c:(.text+0xbf072): undefined reference to `v4l2_prio_check'
uvc_v4l2.c:(.text+0xbf359): undefined reference to `v4l2_prio_check'
drivers/built-in.o:uvc_v4l2.c:(.text+0xbf410): more undefined references to `v4l2_prio_check' follow
drivers/built-in.o: In function `uvc_v4l2_do_ioctl':
uvc_v4l2.c:(.text+0xbf5b8): undefined reference to `v4l2_event_subscribe'
uvc_v4l2.c:(.text+0xbf5c8): undefined reference to `v4l2_event_unsubscribe'
uvc_v4l2.c:(.text+0xbf5e3): undefined reference to `v4l2_event_dequeue'
drivers/built-in.o: In function `uvc_ctrl_add_event':
uvc_ctrl.c:(.text+0xc225e): undefined reference to `v4l2_event_queue_fh'
drivers/built-in.o: In function `uvc_ctrl_send_event':
uvc_ctrl.c:(.text+0xc22fd): undefined reference to `v4l2_event_queue_fh'
drivers/built-in.o:(.rodata+0xfd60): undefined reference to `v4l2_ctrl_replace'
drivers/built-in.o:(.rodata+0xfd68): undefined reference to `v4l2_ctrl_merge'

[Randy Dunlap]

On 06/17/13 10:26, Srinivas Pandruvada wrote:
> On 06/17/2013 10:03 AM, Randy Dunlap wrote:
>> On 06/17/13 01:51, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20130607:
>>>
>>
>> on i386 and x86_64:
>>
>> when built as loadable module:
>>
>> ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
>> ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
>>
>> or when built-in:
>>
>> drivers/built-in.o: In function `pkg_temp_thermal_init':
>> x86_pkg_temp_thermal.c:(.init.text+0x1492b): undefined reference to `platform_thermal_package_notify'
>> x86_pkg_temp_thermal.c:(.init.text+0x14936): undefined reference to `platform_thermal_package_rate_control'
>> x86_pkg_temp_thermal.c:(.init.text+0x150fe): undefined reference to `platform_thermal_package_notify'
>> x86_pkg_temp_thermal.c:(.init.text+0x15109): undefined reference to `platform_thermal_package_rate_control'
>> drivers/built-in.o: In function `pkg_temp_thermal_exit':
>> x86_pkg_temp_thermal.c:(.exit.text+0x3a9b): undefined reference to `platform_thermal_package_notify'
>> x86_pkg_temp_thermal.c:(.exit.text+0x3aa6): undefined reference to `platform_thermal_package_rate_control'
>>
>>
>> Full randconfig file is attached (for loadable module build).
>>
>>
>>
>
> This requires CONFIG_X86_MCE, which is by default is set to "y".

But you can't rely on that symbol being enabled -- there needs to be some
enforcement of it, like the patch below.


---
From: Randy Dunlap <rdu...@infradead.org>

Fix build error in x86_pkg_temp_thermal.c. It requires that
X86_MCE be enabled, so depend on that symbol.
Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
so remove that duplicated dependency.

ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!

Signed-off-by: Randy Dunlap <rdu...@infradead.org>
---
drivers/thermal/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- linux-next-20130617.orig/drivers/thermal/Kconfig
+++ linux-next-20130617/drivers/thermal/Kconfig
@@ -171,8 +171,7 @@ config INTEL_POWERCLAMP

config X86_PKG_TEMP_THERMAL
tristate "X86 package temperature thermal driver"
- depends on THERMAL
- depends on X86
+ depends on X86 && X86_MCE
select THERMAL_GOV_USER_SPACE
default m
help

[Srinivas Pandruvada]

Sorry for this issue. I was about to submit a patch for this,

You should change to

depends on X86 && X86_MCE && X86_THERMAL_VECTOR


Thanks,
Srinivas

depends on X86 && X86_MCE && X86_THERMAL_VECTOR

[Randy Dunlap]

On 06/17/13 11:09, Srinivas Pandruvada wrote:
> Sorry for this issue. I was about to submit a patch for this,
>
> You should change to
>
> depends on X86 && X86_MCE && X86_THERMAL_VECTOR

---
From: Randy Dunlap <rdu...@infradead.org>

Fix build error in x86_pkg_temp_thermal.c. It requires that
X86_MCE be enabled, so depend on that symbol.
Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
so remove that duplicated dependency.

ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!

Signed-off-by: Randy Dunlap <rdu...@infradead.org>
---
drivers/thermal/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- linux-next-20130617.orig/drivers/thermal/Kconfig
+++ linux-next-20130617/drivers/thermal/Kconfig
@@ -171,8 +171,7 @@ config INTEL_POWERCLAMP

config X86_PKG_TEMP_THERMAL
tristate "X86 package temperature thermal driver"
- depends on THERMAL
- depends on X86

+ depends on X86 && X86_MCE && X86_THERMAL_VECTOR

[Borislav Petkov]

X86_THERMAL_VECTOR depends on X86_MCE_INTEL which depends on X86_MCE. So

depends on X86_THERMAL_VECTOR

should be enough, IMO.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

[Srinivas Pandruvada]

OK

[Randy Dunlap]

From: Randy Dunlap <rdu...@infradead.org>

Fix build error in x86_pkg_temp_thermal.c. It requires that

X86_MCE & X86_THERMAL_VECTOR be enabled, so depend on the latter symbol,
since it depends on X86_MCE (indirectly).

Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
so remove that duplicated dependency.

ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!

Signed-off-by: Randy Dunlap <rdu...@infradead.org>
---
drivers/thermal/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- linux-next-20130617.orig/drivers/thermal/Kconfig
+++ linux-next-20130617/drivers/thermal/Kconfig
@@ -171,8 +171,7 @@ config INTEL_POWERCLAMP

config X86_PKG_TEMP_THERMAL
tristate "X86 package temperature thermal driver"
- depends on THERMAL
- depends on X86

+ depends on X86_THERMAL_VECTOR

select THERMAL_GOV_USER_SPACE
default m
help

[Borislav Petkov]

On Mon, Jun 17, 2013 at 12:27:17PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdu...@infradead.org>
>
> Fix build error in x86_pkg_temp_thermal.c. It requires that
> X86_MCE & X86_THERMAL_VECTOR be enabled, so depend on the latter symbol,
> since it depends on X86_MCE (indirectly).
>
> Also, X86_PKG_TEMP_THERMAL is already inside an "if THERMAL" block,
> so remove that duplicated dependency.
>
> ERROR: "platform_thermal_package_rate_control" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
> ERROR: "platform_thermal_package_notify" [drivers/thermal/x86_pkg_temp_thermal.ko] undefined!
>
> Signed-off-by: Randy Dunlap <rdu...@infradead.org>
> ---
> drivers/thermal/Kconfig | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- linux-next-20130617.orig/drivers/thermal/Kconfig
> +++ linux-next-20130617/drivers/thermal/Kconfig
> @@ -171,8 +171,7 @@ config INTEL_POWERCLAMP
>
> config X86_PKG_TEMP_THERMAL
> tristate "X86 package temperature thermal driver"
> - depends on THERMAL
> - depends on X86
> + depends on X86_THERMAL_VECTOR
> select THERMAL_GOV_USER_SPACE
> default m
> help

Acked-by: Borislav Petkov <b...@suse.de>

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

[Zhang Rui]

applied to thermal -next.

thanks,
rui

[Randy Dunlap]

From: Randy Dunlap <rdu...@infradead.org>

Fix kconfig warning and build errors on x86_64 by selecting BINFMT_ELF
when COMPAT_BINFMT_ELF is being selected.

warning: (IA32_EMULATION) selects COMPAT_BINFMT_ELF which has unmet direct dependencies (COMPAT && BINFMT_ELF)

fs/built-in.o: In function `elf_core_dump':
compat_binfmt_elf.c:(.text+0x3e093): undefined reference to `elf_core_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3ebcd): undefined reference to `elf_core_extra_data_size'
compat_binfmt_elf.c:(.text+0x3eddd): undefined reference to `elf_core_write_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3f004): undefined reference to `elf_core_write_extra_data'

Signed-off-by: Randy Dunlap <rdu...@infradead.org>
---

arch/x86/Kconfig | 1 +
1 file changed, 1 insertion(+)

--- linux-next-20130618.orig/arch/x86/Kconfig
+++ linux-next-20130618/arch/x86/Kconfig
@@ -2273,6 +2273,7 @@ source "fs/Kconfig.binfmt"
config IA32_EMULATION
bool "IA32 Emulation"
depends on X86_64
+ select BINFMT_ELF
select COMPAT_BINFMT_ELF
select HAVE_UID16
---help---

[tip-bot for Randy Dunlap]

Commit-ID: d1603990ea626668c78527376d9ec084d634202d
Gitweb: http://git.kernel.org/tip/d1603990ea626668c78527376d9ec084d634202d
Author: Randy Dunlap <rdu...@infradead.org>
AuthorDate: Tue, 18 Jun 2013 12:33:40 -0700
Committer: H. Peter Anvin <h...@linux.intel.com>
CommitDate: Tue, 18 Jun 2013 16:20:32 -0500

x86: fix build error and kconfig for ia32_emulation and binfmt

Fix kconfig warning and build errors on x86_64 by selecting BINFMT_ELF
when COMPAT_BINFMT_ELF is being selected.

warning: (IA32_EMULATION) selects COMPAT_BINFMT_ELF which has unmet direct dependencies (COMPAT && BINFMT_ELF)

fs/built-in.o: In function `elf_core_dump':
compat_binfmt_elf.c:(.text+0x3e093): undefined reference to `elf_core_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3ebcd): undefined reference to `elf_core_extra_data_size'
compat_binfmt_elf.c:(.text+0x3eddd): undefined reference to `elf_core_write_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3f004): undefined reference to `elf_core_write_extra_data'

[ hpa: This was sent to me for -next but it is a low risk build fix ]

Signed-off-by: Randy Dunlap <rdu...@infradead.org>
Link: http://lkml.kernel.org/r/51C0B614...@infradead.org
Cc: <sta...@vger.kernel.org>
Signed-off-by: H. Peter Anvin <h...@linux.intel.com>

---
arch/x86/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 685692c..fe120da 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2265,6 +2265,7 @@ source "fs/Kconfig.binfmt"