Prev: dmaengine cyclic transfers
Next: [PATCH 1/2] rtc: rtc-lpc32xx: Introduce RTC driver for the LPC32XX SoC
From: Sergey Senozhatsky on 10 Aug 2010 11:40
On (08/10/10 17:19), Piotr Hosowicz wrote:
> None of them works for me. I do:
>
> cat patch.txt | patch -p1
>
> And get:
>
> aapi205:/usr/src/linux# cat ../smp-bug.txt | patch -p1
> patching file include/acpi/platform/aclinux.h
> Hunk #1 FAILED at 152.
> 1 out of 1 hunk FAILED -- saving rejects to file
> include/acpi/platform/aclinux.h.rej
>
> Help me please.
>

Can we see your:
include/acpi/platform/aclinux.h(.rej)

?

(did you `git pull`?)


Sergey
From: Piotr Hosowicz on 10 Aug 2010 11:40
On 10.08.2010 17:35, Sergey Senozhatsky wrote:
> On (08/10/10 17:19), Piotr Hosowicz wrote:
>> None of them works for me. I do:
>>
>> cat patch.txt | patch -p1
>>
>> And get:
>>
>> aapi205:/usr/src/linux# cat ../smp-bug.txt | patch -p1
>> patching file include/acpi/platform/aclinux.h
>> Hunk #1 FAILED at 152.
>> 1 out of 1 hunk FAILED -- saving rejects to file
>> include/acpi/platform/aclinux.h.rej
>>
>> Help me please.
>>
>
> Can we see your:
> include/acpi/platform/aclinux.h(.rej)
>
> ?

aapi205:/usr/src/linux# cat include/acpi/platform/aclinux.h.rej
--- include/acpi/platform/aclinux.h
+++ include/acpi/platform/aclinux.h
@@ -152,7 +152,7 @@
#include <linux/hardirq.h>
#define ACPI_PREEMPTION_POINT() \
do { \
- if (!in_atomic_preempt_off() && !irqs_disabled()) \
+ if (!in_atomic() && !irqs_disabled()) \
cond_resched(); \
} while (0)

> (did you `git pull`?)

No, I just downloaded bz2 patch from kernel.org.

Regards,

Piotr Hosowicz

--
Z cyklu "Uroki demokracji", czyli pytania i odpowiedzi w teledurniejach:
- W kt�rym mie�cie europejskim powsta�a pierwsza opera?
- Sydney.
NP: Peter Green Splinter Group - Heart Of Stone
NB: 2.6.35-git9
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
First  |  Prev  | 
Pages: 1 2
Prev: dmaengine cyclic transfers
Next: [PATCH 1/2] rtc: rtc-lpc32xx: Introduce RTC driver for the LPC32XX SoC