Skip to contentSkip to conversation

staging: drop kbuild workaround dummy module from top dir

PATCH In review Paul Gortmaker 3 participants 5 messages Nov 17, 2015 – Feb 8, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: drop kbuild workaround dummy module from top dir

This is essentially a revert of 86f69fe9c069dd8608d238581eea259caa1dfc99 ("Staging: workaround build system bug"), but to call it a revert would imply it was wrong -- rather it seems more like it is just no longer required anymore.

It doesn't list the full details of the failing use case, but the most obvious would appear to be a "make allnoconfig" that subsequently had set just CONFIG_STAGING=y in the .config file, to give:

  paul@builder:~/git/linux-head$ grep STAGING ../staging-allno/.config
  CONFIG_STAGING=y
  # CONFIG_STAGING_MEDIA is not set
  # CONFIG_STAGING_BOARD is not set
  paul@builder:~/git/linux-head$

After building this .config (on ARM, just to be different), we see that built-in.o is created, and the final vmlinux links OK:

  paul@builder:~/git/linux-head$ ls -l ../staging-allno/drivers/staging/built-in.o
  -rw-rw-r-- 1 paul paul 257 Nov 16 18:06 ../staging-allno/drivers/staging/built-in.o
  paul@builder:~/git/linux-head$ file ../staging-allno/drivers/staging/built-in.o
  ../staging-allno/drivers/staging/built-in.o: ELF 32-bit LSB relocatable, ARM, version 1, not stripped
  paul@builder:~/git/linux-head$ nm ../staging-allno/drivers/staging/built-in.o
  nm: ../staging-allno/drivers/staging/built-in.o: no symbols
  paul@builder:~/git/linux-head$ ls -l ../staging-allno/vmlinux
  -rwxrwxr-x 1 paul paul 1236326 Nov 16 18:07 ../staging-allno/vmlinux
  paul@builder:~/git/linux-head$

I also tested an "allmodconfig" and did not see any problems there either. Switching back to x86-64 and testing several things there didn't show any issues either. So it appears we do not need to carry the workaround in tree any longer.

drivers/staging/Makefile +0 -3
index 30918edef5e3..f666937739fb 100644
@@ -1,8 +1,5 @@
 # Makefile for staging directory
 
-# fix for build system bug...
-obj-$(CONFIG_STAGING)		+= staging.o
-
 obj-y				+= media/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
drivers/staging/staging.c deleted +0 -19
deleted file mode 100644
index 233e589c0932..000000000000
@@ -1,19 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-
-static int __init staging_init(void)
-{
-	return 0;
-}
-
-static void __exit staging_exit(void)
-{
-}
-
-module_init(staging_init);
-module_exit(staging_exit);
-
-MODULE_AUTHOR("Greg Kroah-Hartman");
-MODULE_DESCRIPTION("Staging Core");
-MODULE_LICENSE("GPL");
Signature · 1 line
1.8.2.3
Acked-by on v1 1/1
#1 lore raw

Dne 17.11.2015 v 01:58 Paul Gortmaker napsal(a):

Quoted 4 lines

This is essentially a revert of 86f69fe9c069dd8608d238581eea259caa1dfc99 ("Staging: workaround build system bug"), but to call it a revert would imply it was wrong -- rather it seems more like it is just no longer required anymore.

In fact, I can't even reproduce the original bug with 2.6.27 + the initial staging series. I also do not remember any fix for such bug in the recent years. 4b024242e8a4 ("kbuild: Fix linking error built-in.o no such file or directory") is related, but fixing a different problem.

Michal

#2 lore raw
Quoted 6 lines · Michal Marek

Dne 17.11.2015 v 01:58 Paul Gortmaker napsal(a):

Quoted 4 lines

This is essentially a revert of 86f69fe9c069dd8608d238581eea259caa1dfc99 ("Staging: workaround build system bug"), but to call it a revert would imply it was wrong -- rather it seems more like it is just no longer required anymore.

Quoted 6 lines

In fact, I can't even reproduce the original bug with 2.6.27 + the initial staging series. I also do not remember any fix for such bug in the recent years. 4b024242e8a4 ("kbuild: Fix linking error built-in.o no such file or directory") is related, but fixing a different problem.

I can't remember the issue at the moment either, but it was a problem with some sort of config, I'll queue this up and see if anything breaks :)

thanks,

greg k-h

#3 lore raw
Quoted 9 lines · [Re: [PATCH] staging: drop kbuild workaround dummy module from top dir] On…
Quoted 8 lines · Michal Marek

Dne 17.11.2015 v 01:58 Paul Gortmaker napsal(a):

Quoted 4 lines

This is essentially a revert of 86f69fe9c069dd8608d238581eea259caa1dfc99 ("Staging: workaround build system bug"), but to call it a revert would imply it was wrong -- rather it seems more like it is just no longer required anymore.

Quoted 8 lines
Quoted 4 lines

In fact, I can't even reproduce the original bug with 2.6.27 + the initial staging series. I also do not remember any fix for such bug in the recent years. 4b024242e8a4 ("kbuild: Fix linking error built-in.o no such file or directory") is related, but fixing a different problem.

I can't remember the issue at the moment either, but it was a problem with some sort of config, I'll queue this up and see if anything breaks :)

Did you detect any fallout? Just wondering since I didn't see it loop around in linux-next via staging #staging-next yet...

Thanks,
Paul.
--

Quoted 4 lines

thanks,

greg k-h

#4 lore raw
Quoted 16 lines · Paul Gortmaker
Quoted 14 lines · [Re: [PATCH] staging: drop kbuild workaround dummy module from top dir] On…
Quoted 12 lines · Michal Marek

Dne 17.11.2015 v 01:58 Paul Gortmaker napsal(a):

Quoted 4 lines

This is essentially a revert of 86f69fe9c069dd8608d238581eea259caa1dfc99 ("Staging: workaround build system bug"), but to call it a revert would imply it was wrong -- rather it seems more like it is just no longer required anymore.

In fact, I can't even reproduce the original bug with 2.6.27 + the initial staging series. I also do not remember any fix for such bug in the recent years. 4b024242e8a4 ("kbuild: Fix linking error built-in.o no such file or directory") is related, but fixing a different problem.

Quoted 6 lines
Quoted 3 lines

I can't remember the issue at the moment either, but it was a problem with some sort of config, I'll queue this up and see if anything breaks :)

Did you detect any fallout? Just wondering since I didn't see it loop around in linux-next via staging #staging-next yet...

Sorry, it now just got applied, got way behind on patches :(