From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, Dave Jones <davej@redhat•com>,
Lin Ming <ming.m.lin@intel•com>
Subject: linux-next: manual merge of the acpi tree with Linus' tree
Date: Mon, 30 Mar 2009 14:20:23 +1100 [thread overview]
Message-ID: <20090330142023.2cf5269d.sfr@canb.auug.org.au> (raw)
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in
arch/x86/kernel/cpu/cpufreq/longhaul.c between commit
ac617bd0f7b959dc6708ad2f0d6b9dcf4382f1ed ("[CPUFREQ] checkpatch cleanups
for longhaul") from Linus' tree and commit
fb318cbff40964999f303d50bcf541dd9ead6780 ("ACPI: cpufreq: use new bit
register access function") from the acpi tree.
Just a context change. I fixed it up (see below) and can carry it for a
while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/cpu/cpufreq/longhaul.c
index f1c51ae,4e18d51..0000000
--- a/arch/x86/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/x86/kernel/cpu/cpufreq/longhaul.c
@@@ -328,10 -326,10 +328,10 @@@ retry_loop
case TYPE_POWERSAVER:
if (longhaul_flags & USE_ACPI_C3) {
/* Don't allow wakeup */
- acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
+ acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
- do_powersaver(cx->address, clock_ratio_index, dir);
+ do_powersaver(cx->address, mults_index, dir);
} else {
- do_powersaver(0, clock_ratio_index, dir);
+ do_powersaver(0, mults_index, dir);
}
break;
}
@@@ -341,10 -339,10 +341,10 @@@
outb(0, 0x22);
} else if ((pr != NULL) && pr->flags.bm_control) {
/* Enable bus master arbitration */
- acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
+ acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
}
- outb(pic2_mask,0xA1); /* restore mask */
- outb(pic1_mask,0x21);
+ outb(pic2_mask, 0xA1); /* restore mask */
+ outb(pic1_mask, 0x21);
local_irq_restore(flags);
preempt_enable();
next reply other threads:[~2009-03-30 3:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 3:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-12-16 2:00 linux-next: manual merge of the acpi tree with Linus' tree Stephen Rothwell
2009-12-23 22:11 Stephen Rothwell
2009-12-23 22:39 ` Stephen Rothwell
2009-12-24 0:02 ` Stephen Rothwell
2009-12-24 5:02 ` Len Brown
2009-12-24 12:26 ` Stephen Rothwell
2009-12-24 20:05 ` Len Brown
2009-12-25 0:19 ` Stephen Rothwell
2010-01-18 2:56 Stephen Rothwell
2010-01-20 6:12 ` Len Brown
2010-01-20 6:29 ` Stephen Rothwell
2010-05-12 1:21 Stephen Rothwell
2012-03-30 0:46 Stephen Rothwell
2012-10-04 1:40 Stephen Rothwell
2012-10-07 23:49 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090330142023.2cf5269d.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davej@redhat$(echo .)com \
--cc=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ming.m.lin@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox