| Message ID | 5A630F46702DD1498FFD48394B4A664CB39A93520F@john.ad.clarku.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi there, On Fri, Jul 15, 2011 at 11:12 PM, Brian Julin <BJulin@clarku.edu> wrote: > > This patch helps get things compiling/working when ARM946 is selected. It fixes a > missing structure member and a typo in mm/proc-arm946.S > > Signed-off-by: Brian S. Julin <bri@abrij.org> > --- a/arch/arm/mm/proc-arm946.S 2011-07-14 15:00:27.000000000 -0400 > +++ b/arch/arm/mm/proc-arm946.S 2011-07-10 14:27:13.000000000 -0400 > @@ -450,4 +450,5 @@ > .long 0xff00fff0 > .long 0 > + .long 0 > b __arm946_setup > .long cpu_arch_name > @@ -458,5 +459,5 @@ > .long 0 > .long 0 > - .long arm940_cache_fns > + .long arm946_cache_fns > .size __arm946_proc_info, . - __arm946_proc_info If you've not already done so, I suggest you check that your patch applies against Russell's devel-stable branch. There has been a bit of refactoring of some of these files, but I think your patch will stlil apply (unfortunately I'm not in a position to test it right now). The patch looks at least possibly correct (I'm not able to check that either, today...) http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur devel-stable Cheers ---Dave
On Monday, July 18, 2011 6:32 AM, Dave Martin [dave.martin@linaro.org] wrote: > If you've not already done so, I suggest you check that your patch > applies against Russell's devel-stable branch. There has been a bit > of refactoring of some of these files, but I think your patch will > stlil apply (unfortunately I'm not in a position to test it right > now). > > The patch looks at least possibly correct (I'm not able to check that > either, today...) Hunk #1 succeeded at 411 (offset -36 lines). Hunk #2 succeeded at 420 (offset -36 lines). Good enough? The "linux-next" tree on kernel.org seems to have the patched from arm:stable that affect this file, and from the looks of things both hunks are still needed and do not conflict with the renovations. So what now? The last time I submitted a patch was over a decade ago... gerg mentioned something about "rmk's patch system"? -- Brian
On Tue, Jul 19, 2011 at 12:54 AM, Brian Julin <BJulin@clarku.edu> wrote: > > On Monday, July 18, 2011 6:32 AM, Dave Martin [dave.martin@linaro.org] wrote: >> If you've not already done so, I suggest you check that your patch >> applies against Russell's devel-stable branch. There has been a bit >> of refactoring of some of these files, but I think your patch will >> stlil apply (unfortunately I'm not in a position to test it right >> now). >> >> The patch looks at least possibly correct (I'm not able to check that >> either, today...) > > Hunk #1 succeeded at 411 (offset -36 lines). > Hunk #2 succeeded at 420 (offset -36 lines). > > Good enough? The "linux-next" tree on kernel.org seems to have the patched from > arm:stable that affect this file, and from the looks of things both hunks are still needed > and do not conflict with the renovations. Yes, I think so. The large offset is caused by replacement of some code further up the file with macro calls. I don't see any logical conflict between your patch and those changes. If you like: Acked-by: Dave Martin <dave.martin@linaro.org> > So what now? The last time I submitted a patch was over a decade ago... gerg mentioned > something about "rmk's patch system"? If you've not already done so, take a look at http://www.arm.linux.org.uk/developer/patches/info.php http://www.arm.linux.org.uk/developer/ Cheers ---Dave
--- a/arch/arm/mm/proc-arm946.S 2011-07-14 15:00:27.000000000 -0400 +++ b/arch/arm/mm/proc-arm946.S 2011-07-10 14:27:13.000000000 -0400 @@ -450,4 +450,5 @@ .long 0xff00fff0 .long 0 + .long 0 b __arm946_setup .long cpu_arch_name @@ -458,5 +459,5 @@ .long 0 .long 0 - .long arm940_cache_fns + .long arm946_cache_fns .size __arm946_proc_info, . - __arm946_proc_info
This patch helps get things compiling/working when ARM946 is selected. It fixes a missing structure member and a typo in mm/proc-arm946.S Signed-off-by: Brian S. Julin <bri@abrij.org>