Dear Ingo van Lil,
In message 20091005090838.GA22496@zaphod.peppercon.de you wrote:
According to the PPC reference implementation the udelay() function is responsible for resetting the watchdog timer as frequently as needed. Most other architectures do not meet that requirement, so long-running operations might result in a watchdog reset.
This patch adds a generic udelay() function which takes care of resetting the watchdog before calling an architecture-specific __udelay().
This patch does not apply:
Applying: Generic udelay() with watchdog support error: patch failed: cpu/arm920t/s3c24x0/timer.c:97 error: cpu/arm920t/s3c24x0/timer.c: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging cpu/arm920t/s3c24x0/timer.c CONFLICT (content): Merge conflict in cpu/arm920t/s3c24x0/timer.c Auto-merging cpu/blackfin/interrupts.c Auto-merging include/exports.h Failed to merge in the changes. Patch failed at 0001 Generic udelay() with watchdog support
Could you please rebase it against the "next" branch and resubmit it?
Thanks in advance.
Best regards,
Wolfgang Denk