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

Commit 4d86e1b1 authored by Tony Luck's avatar Tony Luck
Browse files

Pull misc2634 into release branch

parents 65c9bb6c b6dcefde

arch/ia64/include/asm/scatterlist.h

+1 −23
Original line number Original line Diff line number Diff line 
#ifndef _ASM_IA64_SCATTERLIST_H

#ifndef _ASM_IA64_SCATTERLIST_H

#define _ASM_IA64_SCATTERLIST_H

#define _ASM_IA64_SCATTERLIST_H





/*

 * Modified 1998-1999, 2001-2002, 2004

 *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co

 */



#include <asm/types.h>



struct scatterlist {

#ifdef CONFIG_DEBUG_SG

	unsigned long sg_magic;

#endif

	unsigned long page_link;

	unsigned int offset;

	unsigned int length;	/* buffer length */



	dma_addr_t dma_address;

	unsigned int dma_length;

};



/*

/*

 * It used to be that ISA_DMA_THRESHOLD had something to do with the

 * It used to be that ISA_DMA_THRESHOLD had something to do with the

 * DMA-limits of ISA-devices.  Nowadays, its only remaining use (apart

 * DMA-limits of ISA-devices.  Nowadays, its only remaining use (apart
@@ -30,9 +11,6 @@ struct scatterlist { 
 */

 */

#define ISA_DMA_THRESHOLD	0xffffffff

#define ISA_DMA_THRESHOLD	0xffffffff





#define sg_dma_len(sg)		((sg)->dma_length)

#include <asm-generic/scatterlist.h>

#define sg_dma_address(sg)	((sg)->dma_address)



#define	ARCH_HAS_SG_CHAIN





#endif /* _ASM_IA64_SCATTERLIST_H */
 
#endif /* _ASM_IA64_SCATTERLIST_H */

arch/ia64/uv/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ void __init uv_setup(char **cmdline_p) 
		uv_cpu_hub_info(cpu)->lowmem_remap_top =

		uv_cpu_hub_info(cpu)->lowmem_remap_top =

			lowmem_redir_base + lowmem_redir_size;

			lowmem_redir_base + lowmem_redir_size;

		uv_cpu_hub_info(cpu)->m_val = m_val;

		uv_cpu_hub_info(cpu)->m_val = m_val;

		uv_cpu_hub_info(cpu)->n_val = m_val;

		uv_cpu_hub_info(cpu)->n_val = n_val;

		uv_cpu_hub_info(cpu)->pnode_mask = (1 << n_val) -1;

		uv_cpu_hub_info(cpu)->pnode_mask = (1 << n_val) -1;

		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;

		uv_cpu_hub_info(cpu)->gpa_mask = (1 << (m_val + n_val)) - 1;

		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;

		uv_cpu_hub_info(cpu)->gnode_upper = gnode_upper;

arch/ia64/kernel/perfmon.c

+2 −2

File changed.

Contains only whitespace changes.