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

Commit 5a99efea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Make flush_tlb_kernel_range() an inline function.
  [SERIAL]: Fix 32-bit warnings in sunzilog.c and sunsu.c
  [SPARC32]: Kill unused vars and macros from prom/console.c
  [SPARC32]: Add __cmpdi2() libcall implementation ala. MIPS.
  [VIDEO]: Do not prom_halt() in cg3 and bw2 device probe.
  [SUNVDC]: Use slice 0xff on VD_DISK_TYPE_DISK.
parents 28d9aa61 17a82e93

arch/sparc/lib/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \ 
         strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \

         strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \

	 strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \

	 strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \

	 copy_user.o locks.o atomic.o \

	 copy_user.o locks.o atomic.o \

	 lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o

	 lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o \

	 cmpdi2.o





obj-y += iomap.o atomic32.o
 
obj-y += iomap.o atomic32.o

arch/sparc/lib/cmpdi2.c

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
#include <linux/module.h>



#include "libgcc.h"



word_type __cmpdi2(long long a, long long b)

{

	const DWunion au = {

		.ll = a

	};

	const DWunion bu = {

		.ll = b

	};



	if (au.s.high < bu.s.high)

		return 0;

	else if (au.s.high > bu.s.high)

		return 2;



	if ((unsigned int) au.s.low < (unsigned int) bu.s.low)

		return 0;

	else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)

		return 2;



	return 1;

}



EXPORT_SYMBOL(__cmpdi2);

arch/sparc/lib/libgcc.h

0 → 100644
+18 −0
Original line number Original line Diff line number Diff line 
#ifndef __ASM_LIBGCC_H

#define __ASM_LIBGCC_H



#include <asm/byteorder.h>



typedef int word_type __attribute__ ((mode (__word__)));



struct DWstruct {

	int high, low;

};



typedef union

{

	struct DWstruct s;

	long long ll;

} DWunion;



#endif /* __ASM_LIBGCC_H */

arch/sparc/prom/console.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -17,9 +17,6 @@ 




extern void restore_current(void);

extern void restore_current(void);





static char con_name_jmc[] = "/obio/su@"; /* "/obio/su@0,3002f8"; */

#define CON_SIZE_JMC	(sizeof(con_name_jmc))



/* Non blocking get character from console input device, returns -1

/* Non blocking get character from console input device, returns -1

 * if no input was taken.  This can be used for polling.

 * if no input was taken.  This can be used for polling.

 */

 */

drivers/block/sunvdc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -417,7 +417,7 @@ static int __send_request(struct request *req) 
	desc->req_id = port->req_id;

	desc->req_id = port->req_id;

	desc->operation = op;

	desc->operation = op;

	if (port->vdisk_type == VD_DISK_TYPE_DISK) {

	if (port->vdisk_type == VD_DISK_TYPE_DISK) {

		desc->slice = 2;

		desc->slice = 0xff;

	} else {

	} else {

		desc->slice = 0;

		desc->slice = 0;

	}

	}