From 6b35eb9ddcddde7b510726de03fae071178f1ec4 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 19 Jan 2011 10:09:42 +0100 Subject: Revert "x86: Make relocatable kernel work with new binutils" This reverts commit 86b1e8dd83cb ("x86: Make relocatable kernel work with new binutils"). Markus Trippelsdorf reported a boot failure caused by this patch. The real solution to the original patch will likely involve an arch-generic solution to define an overlaid jiffies_64 and jiffies variables. Until that's done and tested on all architectures revert this commit to solve the regression. Reported-and-bisected-by: Markus Trippelsdorf Acked-by: "H. Peter Anvin" Cc: Shaohua Li Cc: "Lu, Hongjiu" Cc: Linus Torvalds , Cc: Sam Ravnborg LKML-Reference: <4D36A759.60704@intel.com> Signed-off-by: Ingo Molnar --- arch/x86/kernel/vmlinux.lds.S | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'arch') diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index b34ab80fddd5..bf4700755184 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -34,9 +34,11 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) #ifdef CONFIG_X86_32 OUTPUT_ARCH(i386) ENTRY(phys_startup_32) +jiffies = jiffies_64; #else OUTPUT_ARCH(i386:x86-64) ENTRY(phys_startup_64) +jiffies_64 = jiffies; #endif #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA) @@ -140,15 +142,6 @@ SECTIONS CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) DATA_DATA - /* - * Workaround a binutils (2.20.51.0.12 to 2.21.51.0.3) bug. - * This makes jiffies relocatable in such binutils - */ -#ifdef CONFIG_X86_32 - jiffies = jiffies_64; -#else - jiffies_64 = jiffies; -#endif CONSTRUCTORS /* rarely changed data like cpu maps */ -- cgit v1.2.3-55-g7522 gtreecommitdiffstats
path: root/drivers/scsi/megaraid.c
Commit message (Expand)AuthorAgeFilesLines
* [SCSI] megaraid: add __devexit annotationAdrian Bunk2008-01-121-1/+1
* [SG] Update drivers to use sg helpersJens Axboe2007-10-221-5/+3Star
* [SCSI] add use_sg_chaining option to scsi_host_templateFUJITA Tomonori2007-10-161-0/+1
* Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2007-10-151-2/+1Star
|\
| * [SCSI] kmalloc + memset conversion to kzallocMariusz Kozlowski2007-10-121-2/+1Star
* | [SCSI] megaraid_old: fix READ_CAPACITYFUJITA Tomonori2007-10-041-0/+8
|/
* [SCSI] megaraid_old: convert to use the data buffer accessorsFUJITA Tomonori2007-06-011-106/+25Star
* [SCSI] megaraid: fix compiler warningsMartin Bligh2007-05-261-5/+5
* [SCSI] megaraid: replace yield() with cond_resched()Amol Lad2007-05-081-1/+2
* [SCSI] megaraid: fix warnings when CONFIG_PROC_FS=nwalter harms2007-05-081-6/+11
* PCI: Convert to alloc_pci_dev()Michael Ellerman2007-05-031-1/+1
* [SCSI] megaraid: pci_module_init to pci_register_driverRichard Knutsson2007-02-161-1/+1
* [PATCH] mark struct file_operations const 6Arjan van de Ven2007-02-121-1/+1
* [SCSI] megaraid: fix MMIO castsJeff Garzik2006-12-051-5/+8
* IRQ: Maintain regs pointer globally rather than passing to IRQ handlersDavid Howells2006-10-051-4/+2Star
* [SCSI] megaraid: Make megaraid_ioctl() check copy_to_user() return valueJesper Juhl2006-09-231-2/+3
* [SCSI] Improve inquiry printingMatthew Wilcox2006-08-061-3/+1Star
* [PATCH] irq-flags: scsi: Use the new IRQF_ constantsThomas Gleixner2006-07-021-1/+1
* [PATCH] More BUG_ON conversionEric Sesterhenn2006-06-231-1/+1
* Merge ../linux-2.6James Bottomley2006-06-101-1/+0Star
|\
| * [SCSI] megaraid: unused variableAndrew Morton2006-04-201-1/+0Star
* | [SCSI] fix up request buffer reference in various scsi driversChristoph Hellwig2006-06-061-2/+2
|/
* [PATCH] Replace 0xff.. with correct DMA_xBIT_MASKMatthias Gehre2006-03-281-3/+4
* [SCSI] megaraid_legacy: kobject_register failureJu, Seokmann2006-02-121-1/+1
* [SCSI] turn most scsi semaphores into mutexesArjan van de Ven2006-01-121-3/+3
* Merge by hand (conflicts in scsi_lib.c)James Bottomley2005-12-161-1/+1
|\
| * [SCSI] Fix incorrect pointer in megaraid.c MODE_SENSE emulationMark Lord2005-12-081-1/+1
* | [SCSI] megaraid_legacy: removed PCI ID overlap from the driv erJu, Seokmann2005-12-141-18/+9Star
|/
* [PATCH] fix megaraid.c lockingChristoph Hellwig2005-11-291-15/+14Star
* [SCSI] remove Scsi_Pointer typedefChristoph Hellwig2005-11-09