hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix parport_pc build.
  [SPARC64]: Update defconfig.
This commit is contained in:
Linus Torvalds 2007-03-01 17:28:31 -08:00
parent fb7d404566 74bd7d093b
commit 132a69c6cc
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc64/defconfig
View File

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-rc1 # Linux kernel version: 2.6.21-rc2
# Mon Feb 26 10:45:21 2007 # Wed Feb 28 09:50:51 2007
# #
CONFIG_SPARC=y CONFIG_SPARC=y
CONFIG_SPARC64=y CONFIG_SPARC64=y
@ -1219,6 +1219,7 @@ CONFIG_USB_HIDDEV=y
# CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set # CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set # CONFIG_USB_TEST is not set
# #

4
include/asm-sparc64/dma.h
View File

@ -205,10 +205,6 @@ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \
#define for_each_dvma(dma) \ #define for_each_dvma(dma) \
for((dma) = dma_chain; (dma); (dma) = (dma)->next) for((dma) = dma_chain; (dma); (dma) = (dma)->next)
extern int get_dma_list(char *);
extern int request_dma(unsigned int, __const__ char *);
extern void free_dma(unsigned int);
/* From PCI */ /* From PCI */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI

22
include/asm-sparc64/parport.h
View File

@ -23,8 +23,30 @@ static struct sparc_ebus_info {
struct ebus_dma_info info; struct ebus_dma_info info;
unsigned int addr; unsigned int addr;
unsigned int count; unsigned int count;
int lock;
} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS]; } sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
static __inline__ int request_dma(unsigned int dmanr, const char *device_id)
{
if (dmanr >= PARPORT_PC_MAX_PORTS)
return -EINVAL;
if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
return -EBUSY;
return 0;
}
static __inline__ void free_dma(unsigned int dmanr)
{
if (dmanr >= PARPORT_PC_MAX_PORTS) {
printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
return;
}
if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
return;
}
}
static __inline__ void enable_dma(unsigned int dmanr) static __inline__ void enable_dma(unsigned int dmanr)
{ {
ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1); ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);