Merge lp://staging/~beehock/ubuntu/natty/lirc/lirc.fix-726182 into lp://staging/ubuntu/natty/lirc

Proposed by Hawk
Status: Merged
Merged at revision: 47
Proposed branch: lp://staging/~beehock/ubuntu/natty/lirc/lirc.fix-726182
Merge into: lp://staging/ubuntu/natty/lirc
Diff against target: 32 lines (+12/-0)
2 files modified
debian/changelog (+6/-0)
drivers/lirc_serial/lirc_serial.c (+6/-0)
To merge this branch: bzr merge lp://staging/~beehock/ubuntu/natty/lirc/lirc.fix-726182
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Ubuntu branches Pending
Review via email: mp+53206@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

Thanks for the contribution.

The lirc package has a patch system. See the patches in debian/patches.

I converted your change (thanks for that, btw) to be a patch applied in debian/patches. It's strongly preferred to maintain changes here in a series of patches.

Also, could you please send this patch to the upstream lirc project? Thanks!

review: Approve
Revision history for this message
Hawk (beehock) wrote :

thanks for the advice, Dustin. I was following the sponsorship process
and will certainly looked into the debian/patches.

will also verify if this needs to go upstream.

On Mon, Mar 14, 2011 at 11:50 PM, Dustin Kirkland
<email address hidden> wrote:
> Review: Approve
> Thanks for the contribution.
>
> The lirc package has a patch system.  See the patches in debian/patches

Revision history for this message
Hawk (beehock) wrote :

I was preparing the patch for upstream and found that current_cpu_data
has been replaced by cpu_data(cpu)
for 2.6.38.

http://www.gossamer-threads.com/lists/linux/kernel/1324779

#ifdef CONFIG_SMP
DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
#define cpu_data(cpu) per_cpu(cpu_info, cpu)
#else
#define cpu_info boot_cpu_data
#define cpu_data(cpu) boot_cpu_data
#endif

so would it be better to do this instead?

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
#define current_cpu_data boot_cpu_data
#endif

How to handle the case with SMP CPU?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: