Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22fb53c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Replace 40c7869b kludge
  [MIPS] Lasat: Fix built in separate object directory.
  [MIPS] Malta: Fix software reset on big endian
  [MIPS] pnx8xxx: move to clocksource
  [MIPS] Wrong CONFIG option prevents setup of DMA zone.
parents 8dab6376 e452e94e

arch/mips/kernel/setup.c

+3 −4
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static void __init bootmem_init(void) 


static void __init bootmem_init(void)

{

	unsigned long init_begin, reserved_end;

	unsigned long reserved_end;

	unsigned long mapstart = ~0UL;

	unsigned long bootmap_size;

	int i;
@@ -344,7 +344,6 @@ static void __init bootmem_init(void) 
					 min_low_pfn, max_low_pfn);





	init_begin = PFN_UP(__pa_symbol(&__init_begin));

	for (i = 0; i < boot_mem_map.nr_map; i++) {

		unsigned long start, end;
@@ -352,8 +351,8 @@ static void __init bootmem_init(void) 
		end = PFN_DOWN(boot_mem_map.map[i].addr

				+ boot_mem_map.map[i].size);



		if (start <= init_begin)

			start = init_begin;

		if (start <= min_low_pfn)

			start = min_low_pfn;

		if (start >= end)

			continue;

arch/mips/lasat/image/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ endif 


MKLASATIMG = mklasatimg

MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200

KERNEL_IMAGE = $(TOPDIR)/vmlinux

KERNEL_IMAGE = vmlinux

KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )

KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )



LDSCRIPT= -L$(obj) -Tromscript.normal

LDSCRIPT= -L$(srctree)/$(src) -Tromscript.normal



HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \

		-D_kernel_entry=0x$(KERNEL_ENTRY) \
@@ -24,7 +24,7 @@ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ 
		-D TIMESTAMP=$(shell date +%s)



$(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)

	$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<

	$(CC) -fno-pic $(HEAD_DEFINES) $(LINUXINCLUDE) -c -o $@ $<



OBJECTS = head.o kImage.o

arch/mips/mips-boards/generic/memory.c

+0 −2
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ void __init prom_meminit(void) 


void __init prom_free_prom_memory(void)

{

#if 0 /* for now ...  */

	unsigned long addr;

	int i;
@@ -181,5 +180,4 @@ void __init prom_free_prom_memory(void) 
		free_init_pages("prom memory",

				addr, addr + boot_mem_map.map[i].size);

	}

#endif

}

arch/mips/mips-boards/generic/reset.c

+6 −4
Original line number Diff line number Diff line
@@ -39,16 +39,18 @@ static void atlas_machine_power_off(void); 


static void mips_machine_restart(char *command)

{

	unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int));

	unsigned int __iomem *softres_reg =

		ioremap(SOFTRES_REG, sizeof(unsigned int));



	writew(GORESET, softres_reg);

	__raw_writel(GORESET, softres_reg);

}



static void mips_machine_halt(void)

{

        unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int));

	unsigned int __iomem *softres_reg =

		ioremap(SOFTRES_REG, sizeof(unsigned int));



	writew(GORESET, softres_reg);

	__raw_writel(GORESET, softres_reg);

}



#if defined(CONFIG_MIPS_ATLAS)

arch/mips/mm/dma-default.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp) 
	/* ignore region specifiers */

	gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);



#ifdef CONFIG_ZONE_DMA32

#ifdef CONFIG_ZONE_DMA

	if (dev == NULL)

		gfp |= __GFP_DMA;

	else if (dev->coherent_dma_mask < DMA_BIT_MASK(24))