diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-18 16:28:52 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-18 16:28:52 -0700 |
| commit | 3d620cd75588a37c7f5547e26e2a28b046c280f0 (patch) | |
| tree | b109b7f11744fd0d63a274a1eebed474fa9aedd7 /arch | |
| parent | a1ecf7f6e65637ba4470405ad39794710dbf85d4 (diff) | |
| parent | 301216244b1e39c4346e56d38b079ca53d528580 (diff) | |
| download | op-kernel-dev-3d620cd75588a37c7f5547e26e2a28b046c280f0.zip op-kernel-dev-3d620cd75588a37c7f5547e26e2a28b046c280f0.tar.gz | |
Sync with Linus - rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/pci/fixup.c | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/setup.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c index be52c5a..8e8e895 100644 --- a/arch/i386/pci/fixup.c +++ b/arch/i386/pci/fixup.c @@ -253,7 +253,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci #define MAX_PCIEROOT 6 static int quirk_aspm_offset[MAX_PCIEROOT << 3]; -#define GET_INDEX(a, b) (((a - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + b) +#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + ((b) & 7)) static int quirk_pcie_aspm_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value) { diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 5dfb42f..309797d 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c @@ -753,6 +753,8 @@ void __init setup_arch(char **cmdline_p) strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE); *cmdline_p = cmd_line; + parse_early_param(); + /* set up the bootmem stuff with available memory */ do_init_bootmem(); if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); |
