2.4.24 patch apply failed on vanilla kernel

2.4.24 patch apply failed on vanilla kernel

[Marcel Meckel]

Hello,

trying to patch 2.4.24 patch into a vanilla kernel results in 1
reject:

patching file arch/i386/kernel/acpi.c
patching file arch/i386/kernel/mpparse.c
patching file arch/i386/kernel/smpboot.c
Hunk #1 FAILED at 1106.
1 out of 1 hunk FAILED -- saving rejects to file
arch/i386/kernel/smpboot.c.rej patching file arch/x86_64/kernel/acpi.c
patching file drivers/acpi/Config.in
patching file drivers/acpi/bus.c

Please CC me on replies.

Greetings,
Marcel Meckel.


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Marcel Meckel,


On Wed, 7 Jan 2004 13:46:58 +0100 Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org> wrote:

> trying to patch 2.4.24 patch into a vanilla kernel results in 1
> reject:
> 
> patching file arch/i386/kernel/acpi.c
> patching file arch/i386/kernel/mpparse.c
> patching file arch/i386/kernel/smpboot.c
> Hunk #1 FAILED at 1106.
> 1 out of 1 hunk FAILED -- saving rejects to file
> arch/i386/kernel/smpboot.c.rej patching file arch/x86_64/kernel/acpi.c
> patching file drivers/acpi/Config.in
> patching file drivers/acpi/bus.c
> 
> Please CC me on replies.

Same here, you're not alone in the dark:
Hunk #1 FAILED at 1106.
1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/smpboot.c.rej


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Marcel Meckel,


On Wed, 7 Jan 2004 13:46:58 +0100 Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org> wrote:

> trying to patch 2.4.24 patch into a vanilla kernel results in 1
> reject:
> 
> patching file arch/i386/kernel/acpi.c
> patching file arch/i386/kernel/mpparse.c
> patching file arch/i386/kernel/smpboot.c
> Hunk #1 FAILED at 1106.
> 1 out of 1 hunk FAILED -- saving rejects to file
> arch/i386/kernel/smpboot.c.rej patching file arch/x86_64/kernel/acpi.c
> patching file drivers/acpi/Config.in
> patching file drivers/acpi/bus.c

It is like if the acpi patch is based on a 2.4.24+uv1 patch (that replaces the use
of NR_CPUS w/ BITS_PER_LONG). Quite easy to fix by hand, simply override
the for (..) line w/ the one provided by the acpi patch.


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click

Re: 2.4.24 patch apply failed on vanilla kernel

[Marcel Meckel]

> It is like if the acpi patch is based on a 2.4.24+uv1 patch (that
> replaces the use of NR_CPUS w/ BITS_PER_LONG). Quite easy to fix by
> hand, simply override the for (..) line w/ the one provided by the
> acpi patch.

I changed the patch file and then patch applied without errors on
vanilla kernel.


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Marcel Meckel,


On Wed, 7 Jan 2004 16:39:07 +0100 Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org> wrote:

> > It is like if the acpi patch is based on a 2.4.24+uv1 patch (that
> > replaces the use of NR_CPUS w/ BITS_PER_LONG). Quite easy to fix by
> > hand, simply override the for (..) line w/ the one provided by the
> > acpi patch.
> 
> I changed the patch file and then patch applied without errors on
> vanilla kernel.

I did the same. This should work.
Anyway official acpi patch would have to be updated.


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[Micha Feigin]

On Wed, Jan 07, 2004 at 03:25:40PM +0100, wwp wrote:
> Hi Marcel Meckel,
> 
> 
> On Wed, 7 Jan 2004 13:46:58 +0100 Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org> wrote:
> 
> > trying to patch 2.4.24 patch into a vanilla kernel results in 1
> > reject:
> > 
> > patching file arch/i386/kernel/acpi.c
> > patching file arch/i386/kernel/mpparse.c
> > patching file arch/i386/kernel/smpboot.c
> > Hunk #1 FAILED at 1106.
> > 1 out of 1 hunk FAILED -- saving rejects to file
> > arch/i386/kernel/smpboot.c.rej patching file arch/x86_64/kernel/acpi.c
> > patching file drivers/acpi/Config.in
> > patching file drivers/acpi/bus.c
> > 
> > Please CC me on replies.
> 
> Same here, you're not alone in the dark:
> Hunk #1 FAILED at 1106.
> 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/smpboot.c.rej
> 
> 

I don't know what is the right solution, but its trying to replace
- 	for (bit = 0; bit < BITS_PER_LONG; bit++) {
with
+ 	for (bit = 0; bit < MAX_APICS; bit++) {
While the line actually reads:
	for (cpu = 0; cpu < NR_CPUS; cpu++) {

I left it as is and for now its working.

> Regards,
> 
> -- 
> wwp
> 
> 
> -------------------------------------------------------
> This SF.net email is sponsored by: IBM Linux Tutorials.
> Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
> Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
> Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> _______________________________________________
> Acpi-devel mailing list
> Acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> https://lists.sourceforge.net/lists/listinfo/acpi-devel
> 


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Micha Feigin,


On Wed, 7 Jan 2004 18:07:11 +0200 Micha Feigin <michf-+lLcF8/aw9x6auLlOhE+pQ@public.gmane.org> wrote:

[snip]
> > > patching file arch/i386/kernel/acpi.c
> > > patching file arch/i386/kernel/mpparse.c
> > > patching file arch/i386/kernel/smpboot.c
> > > Hunk #1 FAILED at 1106.
> > > 1 out of 1 hunk FAILED -- saving rejects to file
> > > arch/i386/kernel/smpboot.c.rej patching file arch/x86_64/kernel/acpi.c
> > > patching file drivers/acpi/Config.in
> > > patching file drivers/acpi/bus.c
> > > 
> > > Please CC me on replies.
> > 
> > Same here, you're not alone in the dark:
> > Hunk #1 FAILED at 1106.
> > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/smpboot.c.rej
> > 
> > 
> 
> I don't know what is the right solution, but its trying to replace
> - 	for (bit = 0; bit < BITS_PER_LONG; bit++) {
> with
> + 	for (bit = 0; bit < MAX_APICS; bit++) {
> While the line actually reads:
> 	for (cpu = 0; cpu < NR_CPUS; cpu++) {
> 
> I left it as is and for now its working.

Currently, 2.4.24 uses NR_CPUS, and the fixes in the uv patch
(http://www.hardrock.org/kernel/current-updates/) uses BITS_PER_LONG.

Currently, the acpi patch tries to replace BITS_PER_LONG.
That's a bit confusing :-). That's why we need an answer from the ACPI guy
who manage this part of the patch, IMO.


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[Sérgio Monteiro Basto]

I think 
Full version of kernel2.4.24 have all apci patches updated 

On Wed, 2004-01-07 at 15:50, wwp wrote:
> Hi Marcel Meckel,
> 
> 
> On Wed, 7 Jan 2004 16:39:07 +0100 Marcel Meckel <acpi-X2Xph2rMQzhn68oJJulU0Q@public.gmane.org> wrote:
> 
> > > It is like if the acpi patch is based on a 2.4.24+uv1 patch (that
> > > replaces the use of NR_CPUS w/ BITS_PER_LONG). Quite easy to fix by
> > > hand, simply override the for (..) line w/ the one provided by the
> > > acpi patch.
> > 
> > I changed the patch file and then patch applied without errors on
> > vanilla kernel.
> 
> I did the same. This should work.
> Anyway official acpi patch would have to be updated.
> 
> 
> Regards,
> 
> -- 
> wwp
> 

-- 
Sérgio M B



-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Sérgio Monteiro Basto,


On 07 Jan 2004 20:01:17 +0000 Sérgio Monteiro Basto <sergiomb-hHo3WeeoaswVhHzd4jOs4w@public.gmane.org> wrote:

> I think 
> Full version of kernel2.4.24 have all apci patches updated 

So why is there an acpi-2.4.24 patch??


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Sérgio Monteiro Basto,


On 07 Jan 2004 20:01:17 +0000 Sérgio Monteiro Basto <sergiomb-hHo3WeeoaswVhHzd4jOs4w@public.gmane.org> wrote:

> I think 
> Full version of kernel2.4.24 have all apci patches updated 

Forgotten to say that 2.4.24 doesn't include any change around acpi since
2.4.23, it was only a security fix release (see the Changelog).


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

RE: 2.4.24 patch apply failed on vanilla kernel

[Yu, Luming]

>patching file arch/i386/kernel/smpboot.c
>Hunk #1 FAILED at 1106.
>1 out of 1 hunk FAILED -- saving rejects to file

Caution! 

This piece of code causes SMP boot problme with 2.4.22 and acpi-20031203
Please refer to http://bugme.osdl.org/show_bug.cgi?id=1706 


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

RE: 2.4.24 patch apply failed on vanilla kernel

[Yu, Luming]

>>patching file arch/i386/kernel/smpboot.c
>>Hunk #1 FAILED at 1106.
>>1 out of 1 hunk FAILED -- saving rejects to file
>
>Caution! 
>
>This piece of code causes SMP boot problme with 2.4.22 and
acpi-20031203
>Please refer to http://bugme.osdl.org/show_bug.cgi?id=1706 

Is gcc doing right?

#cat foo.c
main()
{
	int bit;

	for (bit=28; bit < 34; bit++){
		printf("%.4x \n", (1ul << bit)));
	}
}

#gcc foo.c
#./a.out
10000000 
20000000 
40000000 
80000000 

0001	 ( 1<< 33 , It's overflowed, but it should be 0 )
0002	 ( 1<< 34 , It's overflowed, but it should be 0 )


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[Luca Capello]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

IMHO there's an error errors...
on 01/08/04 10:46, Yu, Luming wrote:
| 		printf("%.4x \n", (1ul << bit)));
this should be
	printf("%.4x \n", (1ul << bit));

With this correction, the output is
| luca-HSB4nKSusd8@public.gmane.org:~$ gcc foo.c
| luca-HSB4nKSusd8@public.gmane.org:~$ ./a.out
| 10000000
| 20000000
| 40000000
| 80000000
| 0001
| 0002
| luca-HSB4nKSusd8@public.gmane.org:~$
| luca-HSB4nKSusd8@public.gmane.org:~$ gcc -v
| Reading specs from /usr/lib/gcc-lib/i486-linux/3.3.3/specs
| Configured with: ../src/configure -v
- --enable-languages=c,c++,java,f77,pascal,objc,ada,treelang --prefix=/usr
- --mandir=/usr/share/man --infodir=/usr/share/info
- --with-gxx-include-dir=/usr/include/c++/3.3 --enable-shared
- --with-system-zlib --enable-nls --without-included-gettext
- --enable-__cxa_atexit --enable-clocale=gnu --enable-debug
- --enable-java-gc=boehm --enable-java-awt=xlib --enable-objc-gc i486-linux
| Thread model: posix
| gcc version 3.3.3 20031229 (prerelease) (Debian)

Thx, bye,
Gismo / Luca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Using GnuPG with Debian - http://enigmail.mozdev.org

iD8DBQE//TaCVAp7Xm10JmkRAk5UAJ466yD8w+fxWoKkQWHIR6XGlCBC3QCeMO0e
3q2RsO7FcmL/592kLSuO7P4=
=SkCq
-----END PGP SIGNATURE-----



-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[Brian Perkins]

Yu, Luming wrote:

> 0001	 ( 1<< 33 , It's overflowed, but it should be 0 )
> 0002	 ( 1<< 34 , It's overflowed, but it should be 0 )

According to all the doc that talk about this, the result is "undefined" 
for bit > word_size.

In fact:

#cat > bar.c

main() {
(1ul <<33);
}
# gcc bar.c

bar.c: In function `main':
bar.c:2: warning: left shift count >= width of type

-- 
"I know you believe you understand what you think I said, but I am not
             sure you realise that what you heard is not what I meant."
			    -- Alan Greenspan
Brian Perkins                                bperkins-ooduxAEi7gVg9hUCZPvPmw@public.gmane.org



-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[Len Brown]

Two problems here -- both caused my me -- both now fixed.

1. I mis-merged the line in smpboot.c
when I first found and fixed that bug i replaced NR_CPUS
with MAX_APICS, which made perfect sense for the non-numa
case where MAX_APICS is 16.  wli checked in the BITS_PER_LONG
fix (32) and I mistakenly over-wrote it -- now restored.

2. Marcelo re-named the 2.4.24 bk tree to be 2.4.25
and quickly released a new 2.4.24 tree with just a couple of
changes.  Until tonight, my ACPI patch on kernel.org was
against the 'old' 2.4.24.  I've since updated both the trees
at http://linux-acpi.bkbits.net/ as well as the plain patches
up on http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches

Let me know if I missed anything.

thanks,
-Len

On Wed, 2004-01-07 at 16:56, wwp wrote:
> Hi Sérgio Monteiro Basto,
> 
> 
> On 07 Jan 2004 20:01:17 +0000 Sérgio Monteiro Basto <sergiomb-2XwKdJGMC1E@public.gmane.org.pt> wrote:
> 
> > I think 
> > Full version of kernel2.4.24 have all apci patches updated 
> 
> Forgotten to say that 2.4.24 doesn't include any change around acpi since
> 2.4.23, it was only a security fix release (see the Changelog).
> 
> 
> Regards,



-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html

Re: 2.4.24 patch apply failed on vanilla kernel

[wwp]

Hi Len Brown,


On 09 Jan 2004 05:19:29 -0500 Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:

> Two problems here -- both caused my me -- both now fixed.
> 
> 1. I mis-merged the line in smpboot.c
> when I first found and fixed that bug i replaced NR_CPUS
> with MAX_APICS, which made perfect sense for the non-numa
> case where MAX_APICS is 16.  wli checked in the BITS_PER_LONG
> fix (32) and I mistakenly over-wrote it -- now restored.
> 
> 2. Marcelo re-named the 2.4.24 bk tree to be 2.4.25
> and quickly released a new 2.4.24 tree with just a couple of
> changes.  Until tonight, my ACPI patch on kernel.org was
> against the 'old' 2.4.24.  I've since updated both the trees
> at http://linux-acpi.bkbits.net/ as well as the plain patches
> up on http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches
> 
> Let me know if I missed anything.

Thanx for the clarification!


Regards,

-- 
wwp


-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html