diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:36:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 07:36:36 -0700 |
| commit | b463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch) | |
| tree | bfb3f6bb5c93f32728e5cfd052041f0619055f71 /arch/cris/include | |
| parent | a06cb1ae3cb64367c0fdc313c43ebb0558e51827 (diff) | |
| parent | d75d806cbbfb9c775e87779cd281c9c408c7aba3 (diff) | |
Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson:
"Removal of some unused code from the CRIS port"
* tag 'cris-for-linus-3.7' of git://jni.nu/cris:
CRIS: Remove VCS simulator specific code
cris/PCI: remove pcibios_assign_resources()
Diffstat (limited to 'arch/cris/include')
| -rw-r--r-- | arch/cris/include/arch-v32/arch/page.h | 5 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/arch/processor.h | 6 | ||||
| -rw-r--r-- | arch/cris/include/arch-v32/mach-fs/mach/startup.inc | 6 | ||||
| -rw-r--r-- | arch/cris/include/asm/pci.h | 1 |
4 files changed, 1 insertions, 17 deletions
diff --git a/arch/cris/include/arch-v32/arch/page.h b/arch/cris/include/arch-v32/arch/page.h index 20f1b4806bfe..e5b5aab52de8 100644 --- a/arch/cris/include/arch-v32/arch/page.h +++ b/arch/cris/include/arch-v32/arch/page.h @@ -11,13 +11,8 @@ * selected bit it's possible to convert between KSEG_x and 0x40000000 where the * DRAM really resides. DRAM is virtually at 0xc. */ -#ifndef CONFIG_ETRAX_VCS_SIM #define __pa(x) ((unsigned long)(x) & 0x7fffffff) #define __va(x) ((void *)((unsigned long)(x) | 0x80000000)) -#else -#define __pa(x) ((unsigned long)(x) & 0x3fffffff) -#define __va(x) ((void *)((unsigned long)(x) | 0xc0000000)) -#endif #define VM_STACK_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE) diff --git a/arch/cris/include/arch-v32/arch/processor.h b/arch/cris/include/arch-v32/arch/processor.h index 9603c907fbc4..a024b7d32fed 100644 --- a/arch/cris/include/arch-v32/arch/processor.h +++ b/arch/cris/include/arch-v32/arch/processor.h @@ -21,13 +21,9 @@ struct thread_struct { /* * User-space process size. This is hardcoded into a few places, so don't - * changed it unless everything's clear! + * change it unless everything's clear! */ -#ifndef CONFIG_ETRAX_VCS_SIM #define TASK_SIZE (0xB0000000UL) -#else -#define TASK_SIZE (0xA0000000UL) -#endif /* CCS I=1, enable interrupts. */ #define INIT_THREAD { 0, 0, (1 << I_CCS_BITNR) } diff --git a/arch/cris/include/arch-v32/mach-fs/mach/startup.inc b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc index dd1abbdcbc7a..96c3b0fb62c1 100644 --- a/arch/cris/include/arch-v32/mach-fs/mach/startup.inc +++ b/arch/cris/include/arch-v32/mach-fs/mach/startup.inc @@ -71,12 +71,6 @@ move.d REG_ADDR(bif_core, regi_bif_core, rw_grp4_cfg), $r0 move.d CONFIG_ETRAX_MEM_GRP4_CONFIG, $r1 move.d $r1, [$r0] -#ifdef CONFIG_ETRAX_VCS_SIM - ;; Set up minimal flash waitstates - move.d 0, $r10 - move.d REG_ADDR(bif_core, regi_bif_core, rw_grp1_cfg), $r11 - move.d $r10, [$r11] -#endif .endm #endif diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h index 9f1cd56da28c..146da904cdd8 100644 --- a/arch/cris/include/asm/pci.h +++ b/arch/cris/include/asm/pci.h @@ -19,7 +19,6 @@ extern unsigned long pci_mem_start; void pcibios_config_init(void); struct pci_bus * pcibios_scan_root(int bus); -int pcibios_assign_resources(void); void pcibios_set_master(struct pci_dev *dev); void pcibios_penalize_isa_irq(int irq); |